diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 0680ef1..5188b23 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -551,7 +551,7 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 0680ef1..5188b23 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -551,7 +551,7 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 94242db..d4cd9f9 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -870,7 +870,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 0680ef1..5188b23 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -551,7 +551,7 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 94242db..d4cd9f9 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -870,7 +870,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
index becc185..4daf888 100644
--- a/src/views/mobile/device/success.vue
+++ b/src/views/mobile/device/success.vue
@@ -35,7 +35,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const showMap = ref(false)
 onMounted(() => {

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 0680ef1..5188b23 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -551,7 +551,7 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 94242db..d4cd9f9 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -870,7 +870,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
index becc185..4daf888 100644
--- a/src/views/mobile/device/success.vue
+++ b/src/views/mobile/device/success.vue
@@ -35,7 +35,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const showMap = ref(false)
 onMounted(() => {
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 40c4605..4d7b76f 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -8,7 +8,7 @@
 import FunctionPerm from './functionPerm.vue'
 import DataPerm from './dataPerm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
-import { toTreeList } from '@/utils/structure'
+import { toTreeList, findPid } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
@@ -42,6 +42,7 @@
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
+const allList = ref<any[]>([])
 const loading = ref(false)
 
 // 搜索按钮
@@ -52,12 +53,24 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: RoleInfo): RoleInfo => {
+    let response = res.data
+    allList.value = res.data
+    if (findPid(res.data).length > 1) {
+      const pids = findPid(res.data).filter((item: string) => item !=='0')
+      response.forEach((element:RoleInfo )=> {
+        if(pids.includes(element.pid)) {
+          element.pid = '0'
+        }
+      })
+    }
+
+    const data = response.map((item: RoleInfo): RoleInfo => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
       }
     })
+
     const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
@@ -77,8 +90,11 @@
 }
 // 删除角色
 function del(row: RoleInfo) {
+  // console.log(row, 'row')
+  // 查询当前数据是否含有子数据
+ const hasChildren = allList.value.filter((item: any) => item.pid ===row.id).length
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    hasChildren ? `确定要删除${row.name}吗，当前角色含有子角色` :  `确定要删除${row.name}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -135,7 +151,7 @@
   <app-container>
     <search-area @search="search">
       <search-item>
-        <el-input v-model="listQuery.keyword" placeholder="角色名称" style="width: 162px;" />
+        <el-input v-model.trim="listQuery.keyword" placeholder="角色名称" clearable style="width: 162px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -143,23 +159,29 @@
         <icon-button v-if="proxy.hasPerm('/sys/role/add')" icon="icon-add" title="新增" @click="add" />
         <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;"
+        :tree-props="{ children: 'children' }">
+        <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value"
+          :width="column.width" :align="column.align" />
         <el-table-column
-          v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
-        />
-        <el-table-column v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="210" align="left" header-align="center">
+          v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')"
+          label="操作" width="210" align="left" header-align="center">
           <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small"
+              class="table-text-button" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small"
+              class="table-text-button" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small"
+              class="table-text-button" @click="openFunctionPerm(scope.row)">
               功能权限
             </el-button>
             <!-- 只有自定义显示配置数据权限按钮 -->
-            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary"
+              link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
               数据权限
             </el-button>
           </template>

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 0680ef1..5188b23 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -551,7 +551,7 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 94242db..d4cd9f9 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -870,7 +870,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
index becc185..4daf888 100644
--- a/src/views/mobile/device/success.vue
+++ b/src/views/mobile/device/success.vue
@@ -35,7 +35,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const showMap = ref(false)
 onMounted(() => {
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 40c4605..4d7b76f 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -8,7 +8,7 @@
 import FunctionPerm from './functionPerm.vue'
 import DataPerm from './dataPerm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
-import { toTreeList } from '@/utils/structure'
+import { toTreeList, findPid } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
@@ -42,6 +42,7 @@
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
+const allList = ref<any[]>([])
 const loading = ref(false)
 
 // 搜索按钮
@@ -52,12 +53,24 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: RoleInfo): RoleInfo => {
+    let response = res.data
+    allList.value = res.data
+    if (findPid(res.data).length > 1) {
+      const pids = findPid(res.data).filter((item: string) => item !=='0')
+      response.forEach((element:RoleInfo )=> {
+        if(pids.includes(element.pid)) {
+          element.pid = '0'
+        }
+      })
+    }
+
+    const data = response.map((item: RoleInfo): RoleInfo => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
       }
     })
+
     const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
@@ -77,8 +90,11 @@
 }
 // 删除角色
 function del(row: RoleInfo) {
+  // console.log(row, 'row')
+  // 查询当前数据是否含有子数据
+ const hasChildren = allList.value.filter((item: any) => item.pid ===row.id).length
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    hasChildren ? `确定要删除${row.name}吗，当前角色含有子角色` :  `确定要删除${row.name}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -135,7 +151,7 @@
   <app-container>
     <search-area @search="search">
       <search-item>
-        <el-input v-model="listQuery.keyword" placeholder="角色名称" style="width: 162px;" />
+        <el-input v-model.trim="listQuery.keyword" placeholder="角色名称" clearable style="width: 162px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -143,23 +159,29 @@
         <icon-button v-if="proxy.hasPerm('/sys/role/add')" icon="icon-add" title="新增" @click="add" />
         <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;"
+        :tree-props="{ children: 'children' }">
+        <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value"
+          :width="column.width" :align="column.align" />
         <el-table-column
-          v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
-        />
-        <el-table-column v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="210" align="left" header-align="center">
+          v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')"
+          label="操作" width="210" align="left" header-align="center">
           <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small"
+              class="table-text-button" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small"
+              class="table-text-button" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small"
+              class="table-text-button" @click="openFunctionPerm(scope.row)">
               功能权限
             </el-button>
             <!-- 只有自定义显示配置数据权限按钮 -->
-            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary"
+              link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
               数据权限
             </el-button>
           </template>
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a4f9ee3..23f4a04 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -126,7 +126,7 @@
     addUserRef.value.initDialog('update', user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 重置密码
@@ -152,7 +152,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 批量加密
@@ -202,7 +202,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 冻结/解冻用户
@@ -239,7 +239,7 @@
     roleAssignmentRef.value.initDialog(user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 0680ef1..5188b23 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -551,7 +551,7 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 94242db..d4cd9f9 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -870,7 +870,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
index becc185..4daf888 100644
--- a/src/views/mobile/device/success.vue
+++ b/src/views/mobile/device/success.vue
@@ -35,7 +35,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const showMap = ref(false)
 onMounted(() => {
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 40c4605..4d7b76f 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -8,7 +8,7 @@
 import FunctionPerm from './functionPerm.vue'
 import DataPerm from './dataPerm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
-import { toTreeList } from '@/utils/structure'
+import { toTreeList, findPid } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
@@ -42,6 +42,7 @@
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
+const allList = ref<any[]>([])
 const loading = ref(false)
 
 // 搜索按钮
@@ -52,12 +53,24 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: RoleInfo): RoleInfo => {
+    let response = res.data
+    allList.value = res.data
+    if (findPid(res.data).length > 1) {
+      const pids = findPid(res.data).filter((item: string) => item !=='0')
+      response.forEach((element:RoleInfo )=> {
+        if(pids.includes(element.pid)) {
+          element.pid = '0'
+        }
+      })
+    }
+
+    const data = response.map((item: RoleInfo): RoleInfo => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
       }
     })
+
     const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
@@ -77,8 +90,11 @@
 }
 // 删除角色
 function del(row: RoleInfo) {
+  // console.log(row, 'row')
+  // 查询当前数据是否含有子数据
+ const hasChildren = allList.value.filter((item: any) => item.pid ===row.id).length
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    hasChildren ? `确定要删除${row.name}吗，当前角色含有子角色` :  `确定要删除${row.name}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -135,7 +151,7 @@
   <app-container>
     <search-area @search="search">
       <search-item>
-        <el-input v-model="listQuery.keyword" placeholder="角色名称" style="width: 162px;" />
+        <el-input v-model.trim="listQuery.keyword" placeholder="角色名称" clearable style="width: 162px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -143,23 +159,29 @@
         <icon-button v-if="proxy.hasPerm('/sys/role/add')" icon="icon-add" title="新增" @click="add" />
         <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;"
+        :tree-props="{ children: 'children' }">
+        <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value"
+          :width="column.width" :align="column.align" />
         <el-table-column
-          v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
-        />
-        <el-table-column v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="210" align="left" header-align="center">
+          v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')"
+          label="操作" width="210" align="left" header-align="center">
           <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small"
+              class="table-text-button" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small"
+              class="table-text-button" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small"
+              class="table-text-button" @click="openFunctionPerm(scope.row)">
               功能权限
             </el-button>
             <!-- 只有自定义显示配置数据权限按钮 -->
-            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary"
+              link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
               数据权限
             </el-button>
           </template>
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a4f9ee3..23f4a04 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -126,7 +126,7 @@
     addUserRef.value.initDialog('update', user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 重置密码
@@ -152,7 +152,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 批量加密
@@ -202,7 +202,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 冻结/解冻用户
@@ -239,7 +239,7 @@
     roleAssignmentRef.value.initDialog(user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index f262b91..4e9c686 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -4,6 +4,7 @@
 import type { userType } from './user-interface'
 import { getShowItem, toTreeList } from '@/utils/structure'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import { getRoles } from '@/api/system/user'
 import { roleAssign } from '@/api/system/user'
 const props = defineProps({
   titleText: {
@@ -15,6 +16,7 @@
 const dialogFormVisible = ref<boolean>(false)
 const loading = ref<boolean>(false) // 加载动态效果
 const roleTreeList = ref([])// 角色树列表数据
+const roleId = ref('')
 const defaultProps = ref({
   label: 'name',
   children: 'children',
@@ -31,35 +33,62 @@
 const treeRef = ref()
 // 获取角色列表
 const fetchRoleTree = () => {
-  getRoleTreeListByUser(userId.value).then((response) => {
-    // 过滤掉计量人员角色
-    response.data = response.data.filter((item: any) => item.name !== '计量人员')
+  getRoles().then(response => {
     if (response.data) {
       roleTreeList.value = toTreeList(response.data)
       // 获取展开项和选中项
       const expArr: string[] = []
-      const cheArr: string[] = []
+      let cheArr: string[] = []
       response.data.forEach((element: any) => {
-        if (element.open && element.checked) {
-          expArr.push(element.id)
-          cheArr.push(element.id)
-        }
-        else if (element.open) {
-          expArr.push(element.id)
-        }
-        else if (element.checked) {
-          cheArr.push(element.id)
-        }
+        expArr.push(element.id)
       })
+      if (roleId.value) {
+        const roles = roleId.value.split(',')
+        cheArr = roles
+      }
       defaultExpanded.value = expArr
       defaultChecked.value = cheArr
       treeRef.value?.setCheckedNodes(defaultChecked.value)
       loading.value = false
     }
+    else {
+      roleTreeList.value =  []
+      defaultExpanded.value = []
+      defaultChecked.value = []
+      loading.value = false
+    }
+
   })
+  // getRoleTreeListByUser(userId.value).then((response) => {
+  //   // 过滤掉计量人员角色
+  //   response.data = response.data.filter((item: any) => item.name !== '计量人员')
+  //   if (response.data) {
+  //     roleTreeList.value = toTreeList(response.data)
+  //     // 获取展开项和选中项
+  //     const expArr: string[] = []
+  //     const cheArr: string[] = []
+  //     response.data.forEach((element: any) => {
+  //       if (element.open && element.checked) {
+  //         expArr.push(element.id)
+  //         cheArr.push(element.id)
+  //       }
+  //       else if (element.open) {
+  //         expArr.push(element.id)
+  //       }
+  //       else if (element.checked) {
+  //         cheArr.push(element.id)
+  //       }
+  //     })
+  //     defaultExpanded.value = expArr
+  //     defaultChecked.value = cheArr
+  //     treeRef.value?.setCheckedNodes(defaultChecked.value)
+  //     loading.value = false
+  //   }
+  // })
 }
 // 弹窗初始化
 const initDialog = (row: userType) => {
+  roleId.value = row.roleId
   loading.value = true
   userId.value = row.id
   userName.value = row.name
@@ -70,6 +99,10 @@
 defineExpose({ initDialog })
 const saveData = () => {
   ids.value = treeRef.value.getCheckedKeys()
+  if(!ids.value.length) {
+    ElMessage.warning('请选择角色')
+    return
+  }
   roleAssign(userId.value, ids.value).then((response) => {
     if (response.code === 200) {
       ElMessage.success('角色分配成功')
@@ -85,20 +118,19 @@
   defaultExpanded.value = []
   defaultChecked.value = []
   treeRef.value?.setCheckedNodes([])
-  emits('resetData')
+  // emits('resetData')
 }
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="titleText" width="30%" append-to-body>
-    <el-scrollbar>
-      <el-tree
-        ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
+    <el-scrollbar v-show="roleTreeList.length">
+      <el-tree ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
         :default-expanded-keys="defaultExpanded" :default-checked-keys="defaultChecked"
         :default-expand-all="defaultExpandAll" show-checkbox check-strictly node-key="id"
-        @check-change="handleCheckChange"
-      />
+        @check-change="handleCheckChange" />
     </el-scrollbar>
+    <el-empty  v-show="!roleTreeList.length" description="暂无数据" :image-size="100"  />
     <div class="dialog-footer footer">
       <el-button type="primary" @click="saveData">
         保存

diff --git a/index.html b/index.html
index 0f5e78c..9ecfa5a 100644
--- a/index.html
+++ b/index.html
@@ -40,9 +40,6 @@
     <%- devtoolScript %>
   </body>
   <script>
-    // 感知数据汇聚平台
-    // 北燃施工管理助手
-    // 修改页面标题 和 加载提示标题
     document.title = window.localStorage.getItem('project-name') || '<%= title %>'
     const loading = document.getElementById('loading-text')
     if(loading) {
diff --git a/public/image/other/one-new.png b/public/image/other/one-new.png
new file mode 100644
index 0000000..1d0a40a
--- /dev/null
+++ b/public/image/other/one-new.png
Binary files differ
diff --git a/public/image/other/other-new.png b/public/image/other/other-new.png
new file mode 100644
index 0000000..c0fb76a
--- /dev/null
+++ b/public/image/other/other-new.png
Binary files differ
diff --git a/public/image/other/three-new.png b/public/image/other/three-new.png
new file mode 100644
index 0000000..7334096
--- /dev/null
+++ b/public/image/other/three-new.png
Binary files differ
diff --git a/public/image/other/two-new.png b/public/image/other/two-new.png
new file mode 100644
index 0000000..f8e02a9
--- /dev/null
+++ b/public/image/other/two-new.png
Binary files differ
diff --git a/src/api/home/dashboard/fullScreen.ts b/src/api/home/dashboard/fullScreen.ts
index 25df63f..8346d85 100644
--- a/src/api/home/dashboard/fullScreen.ts
+++ b/src/api/home/dashboard/fullScreen.ts
@@ -51,3 +51,21 @@
     data,
   })
 }
+
+// 设备报警趋势
+
+export function alarmTrend(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTrend',
+    method: 'post',
+    data,
+  })
+}
+// 累计报警统计
+export function alarmTotalStatistics(data: any) {
+  return request({
+    url: '/cockpit/apis/alarmTotalStatistics',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/home/device/device.ts b/src/api/home/device/device.ts
index 0cb5110..900df49 100644
--- a/src/api/home/device/device.ts
+++ b/src/api/home/device/device.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备
-export function removeDevice(data: any) {
+export function removeDevice(data: any, data1: any) {
   return request({
     url: '/system/busDevice/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/product.ts b/src/api/home/device/product.ts
index 391fda5..234a792 100644
--- a/src/api/home/device/product.ts
+++ b/src/api/home/device/product.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除产品
-export function removeProduct(data: any) {
+export function removeProduct(data: any,data1: any) {
   return request({
     url: '/system/baseProduct/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/device/type.ts b/src/api/home/device/type.ts
index 4c74dfd..c865695 100644
--- a/src/api/home/device/type.ts
+++ b/src/api/home/device/type.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除设备类型
-export function removeDeviceType(data: any) {
+export function removeDeviceType(data: any,data1: any) {
   return request({
     url: '/system/baseDeviceType/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/leakage/index.ts b/src/api/home/leakage/index.ts
index 170897c..38f70dc 100644
--- a/src/api/home/leakage/index.ts
+++ b/src/api/home/leakage/index.ts
@@ -1,5 +1,5 @@
 /**
- * 泄露监测
+ * 泄漏监测
  */
 import request from '@/api/index'
 
diff --git a/src/api/home/ledger/location.ts b/src/api/home/ledger/location.ts
index ff131a4..272e155 100644
--- a/src/api/home/ledger/location.ts
+++ b/src/api/home/ledger/location.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除点位
-export function removeLocation(data: any) {
+export function removeLocation(data: any, data1: any) {
   return request({
     url: '/system/busLedgerPipe/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/agreement.ts b/src/api/home/rule/agreement.ts
index 88f28c9..14be07d 100644
--- a/src/api/home/rule/agreement.ts
+++ b/src/api/home/rule/agreement.ts
@@ -13,12 +13,13 @@
 }
 
 // 删除协议
-export function removeAgreement(data: any) {
+export function removeAgreement(data: any, data1: any) {
   return request({
     url: '/system/busProtocol/batchDelete',
     method: 'post',
     data: {
       ids: data,
+      keys: data1
     },
   })
 }
diff --git a/src/api/home/rule/alarm.ts b/src/api/home/rule/alarm.ts
index 30ef3ad..d314113 100644
--- a/src/api/home/rule/alarm.ts
+++ b/src/api/home/rule/alarm.ts
@@ -30,12 +30,13 @@
   })
 }
 // 删除
-export function removeAlarmRule(id: any) {
+export function removeAlarmRule(id: any, name: any) {
   return request({
     url: '/system/alarmRule/batchDelete',
     method: 'post',
     data: {
       ids: [id],
+      keys: [name]
     },
   })
 }
diff --git a/src/api/home/rule/special.ts b/src/api/home/rule/special.ts
index 169ceab..ded99d7 100644
--- a/src/api/home/rule/special.ts
+++ b/src/api/home/rule/special.ts
@@ -12,12 +12,13 @@
   })
 }
 // 删除
-export function removeSpecialAlarmRule(id: any) {
+export function removeSpecialAlarmRule(id: any, key: any) {
   return request({
     url: '/system/alarmRuleDevice/batchDelete',
     method: 'post',
     data: {
       ids: id,
+      keys: key
     },
   })
 }
diff --git a/src/api/index.ts b/src/api/index.ts
index fb47f1a..7652601 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -131,7 +131,7 @@
       else if (message.includes('Request failed with status code')) {
         message = `接口${message.substr(message.length - 3)}异常`
       }
-      if(!message.includes('timeout') || !message.includes('接口请求超时')) {
+      if(!message.includes('timeout') && !message.includes('接口请求超时')) {
         ElMessage({
           message,
           type: 'error',
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9cd519..4beab7a 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -85,3 +85,12 @@
     }
   })
 }
+
+// 获取角色
+
+export function getRoles() {
+  return request({
+    url: 'system/ctUser/getRoles',
+    method: 'post',
+  })
+}
diff --git a/src/assets/fullscren/title-logo.png b/src/assets/fullscren/title-logo.png
new file mode 100644
index 0000000..725990d
--- /dev/null
+++ b/src/assets/fullscren/title-logo.png
Binary files differ
diff --git a/src/assets/images/dashboard/alarm-icon.png b/src/assets/images/dashboard/alarm-icon.png
new file mode 100644
index 0000000..509dafe
--- /dev/null
+++ b/src/assets/images/dashboard/alarm-icon.png
Binary files differ
diff --git a/src/assets/images/map/yhd.png b/src/assets/images/map/yhd.png
new file mode 100644
index 0000000..742d6d7
--- /dev/null
+++ b/src/assets/images/map/yhd.png
Binary files differ
diff --git a/src/assets/images/yellow-spread.svg b/src/assets/images/yellow-spread.svg
new file mode 100644
index 0000000..afd2176
--- /dev/null
+++ b/src/assets/images/yellow-spread.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ffd700;}
+</style>
+<title>涟漪</title>
+<g id="图层_2_1_">
+	<g id="图层_1-2">
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="0s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="0s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6">
+
+			<animate  accumulate="none" additive="replace" attributeName="r" begin="1s" calcMode="linear" dur="2s" fill="remove" from="6" repeatCount="indefinite" restart="always" to="32">
+			</animate>
+
+			<animate  accumulate="none" additive="replace" attributeName="opacity" begin="1s" calcMode="linear" dur="2s" fill="remove" from="1" repeatCount="indefinite" restart="always" to="0">
+			</animate>
+		</circle>
+		<circle class="st0" cx="32" cy="32" r="6"/>
+	</g>
+</g>
+</svg>
diff --git a/src/components/Echart/BarChartHorizontalColor.vue b/src/components/Echart/BarChartHorizontalColor.vue
index 2f2e5b8..aef2f08 100644
--- a/src/components/Echart/BarChartHorizontalColor.vue
+++ b/src/components/Echart/BarChartHorizontalColor.vue
@@ -53,10 +53,10 @@
     type: Object,
     default: () => {
       return {
-        top: 10,
+        top: 0,
         left: 10,
         right: 10,
-        bottom: 10,
+        bottom: 0,
         containLabel: true, // 是否包含坐标轴的刻度标签
       }
     },
@@ -154,7 +154,24 @@
         ['#fed700', '#fdb302', '#fb9600'],
         ['#68dfe3', '#2fade0', '#0182de'],
         ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
         ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
+        ['#fed700', '#feb501', '#fd9502'],
+        ['#2d8cf0', '#2352d6', '#3e29ce'],
+        ['#fed700', '#fdb302', '#fb9600'],
+        ['#68dfe3', '#2fade0', '#0182de'],
+        ['#fd9a19', '#fd6f1b', '#fe421c'],
       ]
     },
   },
@@ -302,6 +319,7 @@
         axisLabel: {
           show: true,
           color: "#fff",
+          // interval: 2,
           // inside: true,
           verticalAlign: "middle",
           // position: 'top',
@@ -337,7 +355,7 @@
         axisLabel: {
           textStyle: {
             color: "#ffffff",
-            fontSize: "15",
+            fontSize: "12",
           },
           formatter: function (value) {
             return value
@@ -350,8 +368,8 @@
   }
   // 数据
   if (props.data.length && props.xAxisData.length) {
-    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
-    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
+    const myColor = ["#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593',"#074282", "#162D71", '#21955D', "#E8BF52", '#4A3D7D', '#B25593']
+    const myColor1 = ["#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593',"#2391FF", "#2352d6", '#21955D', "#E8BF52", '#34277C', '#B25593']
     const newSeries: barSeriesOption[] = [
       {
         name: "报警数量",
@@ -381,16 +399,18 @@
             };
           },
         },
-        barWidth: '60%',
-        barGap: "60%",
+        barWidth: '90%',
+        barGap: "20px",
+        barCategoryGap: '60%',
         data: props.data[0].data,
       },
       {
         name: "",
         type: "bar",
         xAxisIndex: 1,
-        barWidth: '60%',
+        barWidth: '90%',
         barGap: "-100%",
+        barCategoryGap: '10px',
         data: props.xAxisData.map(() => 1),
         itemStyle: {
           normal: {
diff --git a/src/components/HKplayer/index.vue b/src/components/HKplayer/index.vue
index 88b9154..64269b9 100644
--- a/src/components/HKplayer/index.vue
+++ b/src/components/HKplayer/index.vue
@@ -9,6 +9,7 @@
 import errorImg from './error.png'
 import loadingImg from './loading.gif'
 import { ElMessage } from 'element-plus'
+import { RefreshRight } from '@element-plus/icons-vue'
 const props = defineProps({
   playId: {
     require: true,
@@ -194,11 +195,20 @@
 </script>
 
 <template>
-  <div style="width: 100%;height: 100%;" :id="props.playId" class="w-full"></div>
+  <div style="width: 100%;height: 100%; position: relative;">
+    <div  style="width: 100%;height: 100%; position: relative;" :id="props.playId" class="w-full">
+    </div>
+    <!-- <div class="btn"><el-button type="primary" :icon="RefreshRight" @click="" /></div> -->
+  </div>
 </template>
 
 <style scoped lang="scss">
 .w-full {
   position: relative;
 }
+.btn{
+  position: absolute;
+  bottom: 4px;
+  right: 5px;
+}
 </style>
diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts
index 40042d2..1abdbef 100644
--- a/src/directives/table-scroll/index.ts
+++ b/src/directives/table-scroll/index.ts
@@ -23,8 +23,8 @@
     // table-container
     const container =  document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement
     // console.log(container, 'container')
-    container.addEventListener('mouseover', onMouseOver)
-    container.addEventListener('mouseout', onMouseOut)
+    container?.addEventListener('mouseover', onMouseOver)
+    container?.addEventListener('mouseout', onMouseOut)
 
     el.timer = window.setInterval(() => {
       const viewDomClientHeight = viewDom.scrollHeight
diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts
index 8289351..0f7359d 100644
--- a/src/router/modules/pc.ts
+++ b/src/router/modules/pc.ts
@@ -89,7 +89,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/current',
-          auth: '/alarm/detail',
+          auth: '/alarm/current',
         },
       },
       {
@@ -115,7 +115,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/alarm/history',
-          auth: '/alarm/detail',
+          auth: '/alarm/history',
         },
       },
       {
@@ -232,7 +232,6 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/temporary',
-          // auth: '/temporary/detail/menu',
         },
       },
     ],
@@ -282,7 +281,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/well',
-              auth: '/well/detail/menu',
+              auth: '/well',
             },
           },
         ],
@@ -321,7 +320,7 @@
               sidebar: false,
               breadcrumb: true,
               activeMenu: '/station/monitor',
-              auth: '/station/detail',
+              auth: '/station/monitor',
             },
           },
           {
@@ -399,7 +398,7 @@
               sidebar: false,
               breadcrumb: false,
               activeMenu: '/pipeline',
-              auth: '/pipeline/detail/menu',
+              auth: '/pipeline',
             },
           },
         ],
@@ -531,7 +530,7 @@
           sidebar: false,
           breadcrumb: false,
           activeMenu: '/device/manage',
-          auth: '/device/manage/detail/menu',
+          auth: '/device/manage',
         },
       },
       // {
@@ -609,7 +608,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/alarm',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/alarm',
         },
       },
       {
@@ -635,7 +634,7 @@
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/operation/history',
-          auth: '/operation/alarm/detail',
+          auth: '/operation/history',
         },
       },
       {
diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts
index c270e8c..240fc2e 100644
--- a/src/utils/sessionData.ts
+++ b/src/utils/sessionData.ts
@@ -76,10 +76,10 @@
     indexDBHandler('all-video-list', JSON.stringify(res.data))
   })
 }
-// 泄露
+// 泄漏
 export const fetchCacheLeak= () => {
   getLeakageList({}).then(res => {
-    // console.log(res.data, '泄露')
+    // console.log(res.data, '泄漏')
     indexDBHandler('all-leakage-list', JSON.stringify(res.data))
   })
 }
diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue
index 199a47a..08c9eb4 100644
--- a/src/views/home/alarm/current/components/confirmSituation.vue
+++ b/src/views/home/alarm/current/components/confirmSituation.vue
@@ -113,6 +113,7 @@
   loading.value = true
   info.value = row
   alarmCategoryName.value = row.alarmCategory
+  console.log(row.alarmCategory, 'row.alarmCategory')
   if (row.alarmCategory.includes('浓度')) {
     confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0')
 
diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue
index 4572d68..f0cadbc 100644
--- a/src/views/home/alarm/current/components/detail.vue
+++ b/src/views/home/alarm/current/components/detail.vue
@@ -205,7 +205,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue
index ae1a319..101e4a8 100644
--- a/src/views/home/alarm/current/components/detailInfoDialog.vue
+++ b/src/views/home/alarm/current/components/detailInfoDialog.vue
@@ -118,7 +118,7 @@
 }
 // 设备详情
 const goDevice = () => {
-  if (!proxy.hasPerm('/device/manage/detail/menu')) {
+  if (!proxy.hasPerm('/device/manage')) {
     ElMessage.warning('没有对应权限菜单')
     return
   }
@@ -275,7 +275,7 @@
     <!-- 头部 -->
     <div class="header">
       <span class="alarm-content" :title="info.alarmType">{{ info.alarmType }}</span>
-      <span v-if="proxy.hasPerm(type === 'data' ? '/alarm/current/more' : '/alarm/device/more')" class="more"
+      <span class="more"
         @click="moreData">>>更多</span>
     </div>
     <div class="content">
@@ -317,7 +317,7 @@
         </el-tooltip>
         <span v-else style="padding-left: 6px;" class="more" @click="goDevice">{{ info.devcode }} </span>
         <!-- v-if="(info.devTypeName === '燃气智能监测终端' || info.devTypeName === '管网哨兵' || info.devTypeName === '液位检测仪' || info.devTypeName === '井盖监测仪') && proxy.hasPerm('/alarm/current/data')" -->
-        <el-button v-if="info.alarmCategory?.includes('浓度') && proxy.hasPerm('/alarm/current/data')" type="primary"
+        <el-button v-if="info.alarmCategory?.includes('浓度')" type="primary"
           size="small" style="margin-left: 6px;" @click="viewData">
           查看数据
         </el-button>
@@ -384,7 +384,7 @@
         <span style="padding-left: 6px;word-wrap: break-word;">
           {{ info.confirmContent }}
         </span>
-        <el-button v-if="type === 'data' && proxy.hasPerm('/alarm/current/process')" size="small"
+        <el-button v-if="type === 'data'" size="small"
           style="padding-left: 6px;" @click="viewProcess">
           流程图
         </el-button>
@@ -413,7 +413,7 @@
         报警处置
       </el-button>-->
       <!-- (Number(info.processStatus) <= 3 || (type === 'device' && info.processStatusName === '待处置') || info.processStatusName === '挂起') && -->
-      <el-button v-if="proxy.hasPerm('/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
+      <el-button v-if="proxy.hasPerm(type === 'device' ? '/alarm/device/handler' : '/alarm/handler') && info.processStatusName !== '已处置' && info.processStatusName !== '无需处置'" size="small"
         @click="handlerAlarm">
         {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }}
       </el-button>
diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts
index 32c418e..c8ce54f 100644
--- a/src/views/home/alarm/current/components/dict.ts
+++ b/src/views/home/alarm/current/components/dict.ts
@@ -2,7 +2,7 @@
   OffLine: '设备离线',
   Sloping: '倾斜报警',
   Destroy: '破坏报警',
-  Leak: '甲烷泄露报警',
+  Leak: '甲烷泄漏报警',
   DiscL: '左侧断线报警',
   DiscR: '右侧断线报警',
   VibL: '左侧震动报警',
diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue
index 9b67b54..c022cf5 100644
--- a/src/views/home/alarm/current/components/gasDataDialog.vue
+++ b/src/views/home/alarm/current/components/gasDataDialog.vue
@@ -54,7 +54,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 // 列表loading
 const loadingTable = ref(true)
diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue
index 156fbfe..2fb9c6c 100644
--- a/src/views/home/alarm/current/components/monitorDataDialog.vue
+++ b/src/views/home/alarm/current/components/monitorDataDialog.vue
@@ -55,7 +55,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index b3767e0..af75307 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -40,7 +40,7 @@
 const columns = ref<any>([
   { text: '报警类型', value: 'alarmType', align: 'center', width: '130' },
   { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' },
-  { text: '报警原因', value: 'alarmReason', align: 'center', },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' },
   { text: '位置', value: 'position', align: 'center', isCustom: true, },
   { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, },
   { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, },
@@ -456,7 +456,8 @@
     mapRef.value.mapRef.addMarker({
       position: [data.lngGaode, data.latGaode],
       // content: '<div class="spread-circle"></div>',
-      content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' : '<div class="spread-circle2"></div>',
+      content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '<div class="spread-circle1"></div>' :
+        row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '<div class="spread-circle2"></div>' : '<div class="spread-circle3"></div>',
       label: '',
       offsetX: -25,
       offsetY: -25,
@@ -788,7 +789,7 @@
           </template>
           <!-- 查询结果Table显示 -->
           <normal-table ref="tableRef" :data="list1" :total="total" :columns="columnsConfig" :query="listQuery"
-            :list-loading="loadingTable" :height="tableHeight -75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
+            :list-loading="loadingTable" :height="tableHeight - 75" :is-multi="proxy.hasPerm('/alarm/current/delete')"
             :is-showmulti-select="proxy.hasPerm('/alarm/current/delete')" @change="changePage"
             @multiSelect="handleSelectionChange" @rowDbClick="rowClick">
             <template #preColumns>
@@ -819,7 +820,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/current/detail')" label="操作" align="center" width="80">
+              <el-table-column label="操作" align="center" width="80">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
@@ -868,6 +869,14 @@
   border-radius: 50%;
   background: url("@/assets/images/orange-spread.svg") no-repeat center center / cover;
 }
+
+.spread-circle3 {
+  width: 50px;
+  height: 50px;
+  // background-color: #EE9611;
+  border-radius: 50%;
+  background: url("@/assets/images/yellow-spread.svg") no-repeat center center / cover;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 5bf51d6..c410ac8 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -370,7 +370,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/alarm/history/detail')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="moreData(scope.row)">
                 查看
diff --git a/src/views/home/alarm/report/components/list.vue b/src/views/home/alarm/report/components/list.vue
index a438afd..9cb8753 100644
--- a/src/views/home/alarm/report/components/list.vue
+++ b/src/views/home/alarm/report/components/list.vue
@@ -146,7 +146,7 @@
   //选择今天以及今天之前的日期
   return time.getTime() > Date.now() - 1000 * 60 * 60 * 24 * 2;     //如果没有后面的-8.64e7就是不可以选择今天的
 }
-
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -160,7 +160,8 @@
       <el-button type="primary" style="margin-left: 15px;" @click="fetchData">
         生成报表
       </el-button>
-      <el-button type="primary" @click="exportList">
+      <!-- /alarm/report/export -->
+      <el-button v-if="proxy.hasPerm('/alarm/report/export')"  type="primary" @click="exportList">
         导出
       </el-button>
     </div>
diff --git a/src/views/home/dashboard/components/alarmDialog.vue b/src/views/home/dashboard/components/alarmDialog.vue
index 02dda0f..806e814 100644
--- a/src/views/home/dashboard/components/alarmDialog.vue
+++ b/src/views/home/dashboard/components/alarmDialog.vue
@@ -6,6 +6,11 @@
 <script lang="ts" setup name="infoWindow">
 import { detailAlarm } from '@/api/home/alarm/current'
 import { toHumpObject } from '@/utils/String'
+import { hexToRgb } from '@/utils/String'
+import { ElMessage } from 'element-plus'
+import monitorDataDialog from '@/views/home/alarm/current/components/monitorDataDialog.vue'
+import gasDataDialog from '@/views/home/alarm/current/components/gasDataDialog.vue'
+import processDialog from '@/views/home/alarm/current/components/processDialog.vue'
 const dialogFormVisible = ref(false)
 const overlay = ref()
 const infoWindow = ref()
@@ -21,7 +26,7 @@
 // 初始化
 const loading = ref(true)
 const initDialog = (e: any) => {
-  // console.log(e, '信息窗体接收的数据')
+  console.log(e, '报警信息')
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
@@ -30,6 +35,7 @@
   loading.value = true
   detailAlarm(info.value.id).then((res) => {
     info.value = toHumpObject(res.data)
+    console.log(info.value, 'info.value')
     info.value.alarmType = e.info.alarmType
     loading.value = false
   }).catch(() => {
@@ -50,10 +56,89 @@
     },
   })
 }
+// 标签样式
+const computedStyle = (name: string) => {
+  const style = {
+    padding: '0 9px',
+    'font-size': '12px',
+    'border-radius': '4px',
+    height: '24px',
+    display: 'display: inline-flex',
+    'vertical-align': 'middle',
+    'justify-content': 'center',
+    'margin-left': '10px',
+    'line-height': '1',
+    'align-items': 'center',
+    'box-sizing': 'border-box',
+  } as { [key: string]: string }
+  const handlerStyle = (color: string) => {
+    style['color'] = color
+    style['border'] = `0.5px solid rgba(${hexToRgb(color)}, 0.5)`
+    style['background'] = `rgba(${hexToRgb(color)}, 0.08)`
+  }
+  if (!name) {
+    return style
+  }
+  if (name?.includes('未读')) {
+    handlerStyle('#f56c6c')
+  }
+  else if (name?.includes('已读')) {
+    handlerStyle('#0D76D4')
+  }
+  else if (name?.includes('待现场确认') || name?.includes('待处置')) {
+    handlerStyle('#F7C948')
+  }
+  else if (name?.includes('挂起')) {
+    handlerStyle('#F58800')
+  }
+  else if (name?.includes('已处置') || name?.includes('已确认')) {
+    handlerStyle('#67c23a')
+  }
+  return style
+}
+// 查看数据
+const dataRef = ref()
+const gasRef = ref()
+const viewData = () => {
+  if (info.value.devTypeName.includes('燃气智能监测终端')) {
+    dataRef.value.initDialog(info.value)
+  }
+  else {
+    gasRef.value.initDialog(info.value)
+  }
+}
+// 设备详情
+const { proxy } = getCurrentInstance() as any
+const goDevice = () => {
+  if (!proxy.hasPerm('/device/manage')) {
+    ElMessage.warning('没有对应权限菜单')
+    return
+  }
+  $router.push({
+    path: '/manage/detail',
+    query: {
+      id: info.value.ledgerId,
+      row: JSON.stringify({
+        ...info.value,
+        id: info.value.ledgerId,
+      }),
+    },
+  })
+}
+// 查看流程
+const processRef = ref()
+const viewProcess = () => {
+  processRef.value.initDialog(info.value)
+}
 </script>
 
 <template>
   <div v-show="dialogFormVisible" class="container" @mouseleave="() => { }">
+    <!-- 查看数据 -->
+    <monitor-data-dialog ref="dataRef" />
+    <gas-data-dialog ref="gasRef" />
+    <!-- 流程图 -->
+    <process-dialog ref="processRef" />
     <div class="header">
       <div style="display: flex;align-items: center;">
         <div class="icon-alarm" />
@@ -66,27 +151,39 @@
     <div v-loading="loading" class="contnt-alarm">
       <div class="item-alarm">
         <div class="alarm-name">
+          报警原因:
+        </div>
+        <div class="alarm-value" style="color: red;">
+          {{ info?.alarmContent }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          报警设备:
+        </div>
+        <div class="alarm-value">
+          <span class="more" @click="goDevice">{{ info?.devcode }}</span>
+          <el-button v-if="info.alarmType?.includes('浓度')" type="primary" size="small" style="margin-left: 6px;"
+            @click="viewData">
+            查看数据
+          </el-button>
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
           报警时间:
         </div>
         <div class="alarm-value">
           {{ info?.alarmTime }}
         </div>
       </div>
-      <div class="item-alarm">
-        <div class="alarm-name">
-          报警原因:
-        </div>
-        <div class="alarm-value">
-          {{ info?.alarmContent }}
-        </div>
-      </div>
-      <div class="item-alarm">
+      <div v-if="info.alarmType?.includes('浓度')" class="item-alarm">
         <div class="alarm-name">
           位置:
         </div>
         <div class="alarm-value">
           <!-- {{ info?.ledgerNumber }} {{ info?.ledgerName }} -->
-            {{ info?.address }}
+          {{ info?.address }}
         </div>
       </div>
       <div class="item-alarm">
@@ -121,6 +218,44 @@
           {{ info?.manageType }}
         </div>
       </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          负责人:
+        </div>
+        <div class="alarm-value">
+          {{ info?.personName }}
+        </div>
+      </div>
+      <div class="item-alarm">
+        <div class="alarm-name">
+          状态:
+        </div>
+        <div class="alarm-value">
+          <span :style="computedStyle(info.processStatusName)">
+            {{ info.processStatusName }}
+          </span>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) > 4" class="item-alarm">
+        <div class="alarm-name">
+          现场确认:
+        </div>
+        <div class="alarm-value">
+          {{ info.confirmContent }}
+          <el-button size="small"
+          style="padding-left: 6px;" @click="viewProcess">
+          流程图
+        </el-button>
+        </div>
+      </div>
+      <div v-if="info.processStatusName !== '已读' && Number(info.processStatus) >= 6" class="item-alarm">
+        <div class="alarm-name">
+          处置情况:
+        </div>
+        <div class="alarm-value">
+          {{ info?.processContent }}
+        </div>
+      </div>
       <!-- <div class="btns">
         <el-button size="small" @click="detail">
           查看
@@ -138,6 +273,15 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.more {
+  color: #0d76d4;
+
+  &:hover {
+    cursor: pointer;
+    text-decoration: underline;
+  }
+}
+
 .container {
   width: 390px;
   // padding: 0 10px;
@@ -156,7 +300,7 @@
     .icon-alarm {
       width: 25px;
       height: 25px;
-      background: url("@/assets/images/dashboard/alarm.png") no-repeat center / cover;
+      background: url("@/assets/images/dashboard/alarm-icon.png") no-repeat center / cover;
     }
 
     .title {
diff --git a/src/views/home/dashboard/components/controlMap.vue b/src/views/home/dashboard/components/controlMap.vue
index 679778a..3758264 100644
--- a/src/views/home/dashboard/components/controlMap.vue
+++ b/src/views/home/dashboard/components/controlMap.vue
@@ -27,7 +27,7 @@
 // administration行政   demonstration95示范区
 const showStatus = ref('')
 // // 展示图例数据
-const legendShowData = ref(['1', '2', '3', '0'])
+const legendShowData = ref(['1', '2', '3'])
 // // 地图图例数据
 const legendData = ref([
   {
@@ -36,20 +36,15 @@
     value: '1',
   },
   {
-    name: '异常',
-    url: `${publicPath}/image/well/well-error.png`,
+    name: '报警',
+    url: `${publicPath}/image/well/well-stop.png`,
     value: '2',
   },
   {
-    name: '离线',
-    url: `${publicPath}/image/well/well-off.png`,
+    name: '故障',
+    url: `${publicPath}/image/well/well-error.png`,
     value: '3',
   },
-  {
-    name: '未监控',
-    url: `${publicPath}/image/well/well-will.png`,
-    value: '0',
-  },
 ])
 
 // 获取闸井数据
@@ -68,27 +63,27 @@
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
       {
+        url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      },
+      {
         url: `${publicPath}/image/well/well-error.png`, // 图标地址
         // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
         // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
         zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
       },
-      {
-        url: `${publicPath}/image/well/well-off.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
-      {
-        url: `${publicPath}/image/well/well-will.png`, // 图标地址
-        // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-        // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-        zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-      },
+      // {
+      //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+      //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+      // },
     ]
     // （0：未监控，1：正常，2：异常，3：离线）
     const styleDict = {
-      0: 3,
+      // 0: 3,
       1: 0,
       2: 1,
       3: 2,
@@ -106,7 +101,7 @@
       })).filter((item: any) => String(item.monitorState) === String(i))
       all = [...all, ...data]
     }
-    mapRef.value.addCluster(all)
+    mapRef.value.addCluster(all, style)
   }
   const fetch = () => {
     getWellList({}).then((res) => {
@@ -140,27 +135,27 @@
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
     {
+      url: `${publicPath}/image/well/well-stop.png`, // 图标地址
+      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    },
+    {
       url: `${publicPath}/image/well/well-error.png`, // 图标地址
       // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
       // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
       zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
     },
-    {
-      url: `${publicPath}/image/well/well-off.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
-    {
-      url: `${publicPath}/image/well/well-will.png`, // 图标地址
-      // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
-      // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
-      zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
-    },
+    // {
+    //   url: `${publicPath}/image/well/well-will.png`, // 图标地址
+    //   // anchor: new mapRef.value.AMap.Pixel(4, 4), // 图标显示位置偏移量，基准点为图标左上角
+    //   // size: new mapRef.value.AMap.Size(20, 20), // 图标的尺寸
+    //   zIndex: 99, // 每种样式图标的叠加顺序，数字越大越靠前
+    // },
   ]
   // （0：未监控，1：正常，2：异常，3：离线）
   const styleDict = {
-    0: 3,
+    // 0: 3,
     1: 0,
     2: 1,
     3: 2,
@@ -176,7 +171,7 @@
       type: 'well',
     })).filter((item: any) => String(item.monitorState) === String(i))
     if (data.length > 1000) {
-      mapRef.value.addCluster(data)
+      mapRef.value.addCluster(data, style)
     }
     else {
       mapRef.value.addMassMarks({
@@ -1679,9 +1674,9 @@
     </div>
     <!-- 九五示范区的站，井，箱等数量 -->
     <!--  -->
-    <div v-if="showStatus === 'demonstration'" class="show-count">
+    <!-- <div v-if="showStatus === 'demonstration'" class="show-count">
       <base-over />
-    </div>
+    </div> -->
     <!-- 左侧 -->
     <div class="left-container">
       <!-- 基本概况 -->
diff --git a/src/views/home/dashboard/components/eventMap.vue b/src/views/home/dashboard/components/eventMap.vue
index baa9363..0ea7beb 100644
--- a/src/views/home/dashboard/components/eventMap.vue
+++ b/src/views/home/dashboard/components/eventMap.vue
@@ -14,6 +14,8 @@
 import { img } from './imgData'
 import { getAlarmLevelListPage } from '@/api/home/rule/alarm'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
 import AMap from '@/components/map/index.vue'
 // 地图实例
 const mapRef = ref()
@@ -61,6 +63,34 @@
     info: alarmList.value.filter((item: {id: string}) => item.id === data.event.data.id)[0] || data.event.data,
   })
 }
+// 打开信息窗体
+const openInfoDetail = (data: any) => {
+  mapRef.value.map.setZoom(11)
+  // 定义弹窗
+  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,
+    })
+    // const center = JSON.parse(JSON.stringify(data.lnglat))
+    // center[1] = Number(center[1]) + 0.0002
+    mapRef.value.map.setCenter(data.lnglat)
+  })
+}
+// const clickMaker = () => {
+//   console.log(11111111111111)
+// }
 
 // 点击图例，显示隐藏对应的点或线
 const clickLegend = (data: { name: string; type: string }) => {
@@ -94,12 +124,12 @@
     预警: '#ee9611',
   } as { [key: string]: string }
   const imgObj = {
-    一级: `${publicPath}/image/other/one-icon.png`,
-    二级: `${publicPath}/image/other/two-icon.png`,
-    三级: `${publicPath}/image/other/three-icon.png`,
-    其他: `${publicPath}/image/other/other-icon.png`,
-    报警: `${publicPath}/image/other/one-icon.png`,
-    预警: `${publicPath}/image/other/two-icon.png`,
+    一级: `${publicPath}/image/other/one-new.png`,
+    二级: `${publicPath}/image/other/two-new.png`,
+    三级: `${publicPath}/image/other/three-new.png`,
+    其他: `${publicPath}/image/other/other-new.png`,
+    报警: `${publicPath}/image/other/one-new.png`,
+    预警: `${publicPath}/image/other/two-new.png`,
   } as { [key: string]: string }
   legendData.value = []
   legend.value = []
@@ -128,48 +158,58 @@
 }
 // 获取报警
 const alarmList = ref<any[]>([])
-
+  const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const fetchAlarm = () => {
-  getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
-    alarmList.value = res.data.rows
+    // 报警类别
+    getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 9999 }).then((res) => {
+    alarmList.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
     const style = [
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '一级',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '二级',
       },
       {
-        url: `${publicPath}/image/other/three.png`,
+        url: `${publicPath}/image/other/three-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '三级',
       },
       {
-        url: `${publicPath}/image/other/other.png`,
+        url: `${publicPath}/image/other/other-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '其他',
       },
       {
-        url: `${publicPath}/image/other/one.png`,
+        url: `${publicPath}/image/other/one-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
         type: '报警',
       },
       {
-        url: `${publicPath}/image/other/two.png`,
+        url: `${publicPath}/image/other/two-new.png`,
         // anchor: new mapRef.value.AMap.Pixel(4, 4),
         // size: new mapRef.value.AMap.Size(18, 18),
         zIndex: 99,
@@ -190,6 +230,8 @@
     mapRef.value.map.setCenter([alarmList.value[0].lngGaode, alarmList.value[0].latGaode])
     mapRef.value.map.setZoom(11)
   })
+  })
+
 }
 // 获取报警
 // 地图挂载完毕执行
@@ -208,7 +250,7 @@
       <!-- 各分公司报警统计  -->
       <dept-alarm-count type=" " style="margin-top: 20px;" />
       <!-- 当前报警 -->
-      <current-alarm style="margin-top: 20px;" />
+      <current-alarm style="margin-top: 20px;" @clickMaker="openInfoDetail" />
     </div>
     <!-- 右侧 -->
     <div class="right-container">
@@ -346,8 +388,8 @@
     //   opacity: 0.8;
     // }
     img {
-      height: 16px;
-      width: 16px;
+      height: 20px;
+      width: 20px;
     }
 
     .value {
diff --git a/src/views/home/dashboard/deviceMonitor.vue b/src/views/home/dashboard/deviceMonitor.vue
index 79856f1..ca22a96 100644
--- a/src/views/home/dashboard/deviceMonitor.vue
+++ b/src/views/home/dashboard/deviceMonitor.vue
@@ -200,7 +200,7 @@
   const onlineStateDict = {
     1: '正常',
     2: '报警',
-    3: '故障(离线)',
+    3: '故障',
     0: '故障(离线)',
   } as { [key: string]: string }
   if (!isScroll) {
@@ -557,7 +557,7 @@
 const treeRef = ref()
 setTimeout(() => {
   const data = [
-    { id: '1', value: '1-1', label: '泄露监测', pid: '0' },
+    { id: '1', value: '1-1', label: '泄漏监测', pid: '0' },
     { id: '2', value: '1', label: '闸井', pid: '1' },
     { id: '3', value: '2', label: '场站', pid: '1' },
     { id: '4', value: '3', label: '管线', pid: '1' },
@@ -597,7 +597,7 @@
     data.forEach((element: any) => {
       if (!element.value) {
         if (element.watchType === '1') {
-          // 泄露监测
+          // 泄漏监测
           element.value = element.type
         }
         if (element.watchType === '2') {
@@ -1096,7 +1096,7 @@
               <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
               <el-option label="正常" value="1" />
               <el-option label="报警" value="2" />
-              <el-option label="故障(离线)" value="0,3" />
+              <el-option label="故障" value="0,3" />
             </el-select>
           </search-item>
         </search-area>
diff --git a/src/views/home/dashboard/fullScreen-components/alarmCount.vue b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
index 4c559a6..64f0c3b 100644
--- a/src/views/home/dashboard/fullScreen-components/alarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/alarmCount.vue
@@ -5,6 +5,9 @@
  -->
 <script lang="ts" setup name="FullScreenAccumulatedAlarmStatistics">
 import layout from './layout.vue'
+import { alarmTotalStatistics } from '@/api/home/dashboard/fullScreen'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,48 +16,92 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
+const loading = ref(false)
+const fetchData = () => {
+  loading.value = true
+  alarmTotalStatistics(listQuery.value).then(res => {
+    // console.log(res.data, '累计报警统计')
+    data.value = []
+    xAxisData.value = []
 
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+    else {
+      // console.log(res.data, '累计报警统计')
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, '结果')
+      arr.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.alarmTotal)
+      });
+    }
+
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
 onMounted(() => {
-  setTimeout(() => {
-    data.value = [1212, 598, 449, 1387]
-    xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-    // console.log(3000)
-  }, 3000)
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="累计报警统计" subtitle="Accumulated Alarm Statistics">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
@@ -71,7 +118,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -100,9 +147,9 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 </style>
diff --git a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
index 81e9856..1e3bf3f 100644
--- a/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/allAlarmStatus.vue
@@ -28,17 +28,17 @@
 }
 const dataList = ref([
   {
-    name: '闸井泄露',
+    name: '闸井泄漏',
     id: '1',
-    value: '15',
+    value: '0',
   },
   {
-    name: '管线泄露',
+    name: '管线泄漏',
     id: '2',
-    value: '16',
+    value: '0',
   },
   {
-    name: '场站泄露',
+    name: '场站泄漏',
     id: '3',
     value: '0',
   },
@@ -50,12 +50,12 @@
   {
     name: '外力破坏',
     id: '5',
-    value: '2',
+    value: '0',
   },
   {
     name: '其他',
     id: '6',
-    value: '2',
+    value: '0',
   },
 ])
 
diff --git a/src/views/home/dashboard/fullScreen-components/baseOver.vue b/src/views/home/dashboard/fullScreen-components/baseOver.vue
index d56005f..501c75d 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOver.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOver.vue
@@ -6,33 +6,39 @@
 <script lang="ts" setup name="FullScreenBaseOver">
 import { overall } from '@/api/home/dashboard/fullScreen'
 const baseInfo = ref([
-  {
-    name: '管线',
-    value: '0',
-    unit: '公里',
-  },
-  {
-    name: '闸井',
-    value: '0',
-    unit: '座',
-  },
+  // {
+  //   name: '管线',
+  //   value: '0',
+  //   unit: '公里',
+  // },
   {
     name: '调压站',
     value: '0',
     unit: '个',
   },
   {
+    name: '闸井',
+    value: '0',
+    unit: '座',
+  },
+
+  {
     name: '调压箱',
     value: '0',
     unit: '座',
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: '1' }).then((res) => {
-    // console.log(res.data, '基本概括')
+    console.log(res.data, '基本概括111111111111')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
diff --git a/src/views/home/dashboard/fullScreen-components/baseOverView.vue b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
index 5c33bd1..e116cc4 100644
--- a/src/views/home/dashboard/fullScreen-components/baseOverView.vue
+++ b/src/views/home/dashboard/fullScreen-components/baseOverView.vue
@@ -27,15 +27,16 @@
   tyz: new URL('@/assets/images/map/tyz.png', import.meta.url),
   zj: new URL('@/assets/images/map/zj.png', import.meta.url),
   tyx: new URL('@/assets/images/map/tyx.png', import.meta.url),
+  yhd: new URL('@/assets/images/map/yhd.png', import.meta.url),
 }
 const dataList = ref([
-  {
-    name: '管线',
-    id: '1',
-    unit: 'KM',
-    value: '0',
-    img: img.gx,
-  },
+  // {
+  //   name: '管线',
+  //   id: '1',
+  //   unit: 'KM',
+  //   value: '0',
+  //   img: img.gx,
+  // },
   {
     name: '调压站',
     id: '2',
@@ -57,21 +58,32 @@
     value: '0',
     img: img.tyx,
   },
+  {
+    name: '隐患点',
+    value: '0',
+    unit: '个',
+    img: img.yhd
+  },
 ])
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
   overall({ type: $props.type }).then((res) => {
-    // console.log(res.data, '基本概括')
+    const data1 = res.data.map((item: any) => ({
+      ...item,
+      value: item.name === 'tyz' ? Number(item.value) - Number(res.data.filter((item: any) => item.name === 'tyx')[0]?.value || '0') : item.value
+    }))
+    // console.log(res.data, '基本概括222222222222222')
     const dataDict = {
       调压箱: 'tyx',
       闸井: 'zj',
       调压站: 'tyz',
       管线: 'gx',
+      隐患点: 'YHD',
     } as { [key: string]: any }
     dataList.value.forEach((item: any) => {
-      const data = res.data.filter((citem: any) => citem.name === dataDict[item.name])
+      const data = data1.filter((citem: any) => citem.name === dataDict[item.name])
       if (data.length) {
         item.value = data[0].value
       }
diff --git a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
index 73da3b1..2cb78cf 100644
--- a/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
+++ b/src/views/home/dashboard/fullScreen-components/currentAlarm.vue
@@ -6,6 +6,10 @@
 <script lang="ts" setup name="FullScreenBasicOverView">
 import layout from './layout.vue'
 import { getCurrentAlarmListPage } from '@/api/home/alarm/current'
+import { getDictByCode } from '@/api/system/dict'
+import { alarmValue } from '@/views/home/alarm/current/components/dict'
+import { ElMessage } from 'element-plus'
+const $emit = defineEmits(['clickMaker'])
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -14,112 +18,59 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const loadingTable = ref(true)
 const columns = ref<any[]>([
-  { text: '报警类型', value: 'alarmType', align: 'center' },
-  { text: '管理单位', value: 'deptName', align: 'center' },
-  { text: '报警内容', value: 'alarmContent', align: 'center' },
-  { text: '报警时间', value: 'alarmTime', align: 'center' },
-  { text: '报警地点', value: 'position', align: 'center' },
-  { text: '确认状态', value: 'processStatusName', align: 'center' },
+  { text: '报警类型', value: 'alarmType', align: 'center', width: 110 },
+  { text: '报警原因', value: 'alarmReason', align: 'center', width: 110 },
+  { text: '报警时间', value: 'ts', align: 'center' },
 ])
 const list = ref<any[]>([])
+const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 onMounted(() => {
   loadingTable.value = true
-  getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
-    // console.log(res.data.rows, '当前报警数据')
-    list.value = res.data.rows
-    loadingTable.value = false
+  // 报警类别
+  getDictByCode('alarmCategory').then((res) => {
+    alarmCategoryList.value = res.data.filter((item: any) => !item.name.includes('设备'))
+    getCurrentAlarmListPage({ offset: 1, limit: 999 }).then(res => {
+      // console.log(res.data.rows, '当前报警数据')
+      list.value = res.data.rows.map((item: any) => ({
+        ...item,
+        alarmCategoryName: alarmCategoryList.value.length ? alarmCategoryList.value.filter((citem: any) => citem.value === item.alarmCategory)[0]?.name || '' : '',
+        // showDeviceTips: false, // 展示设备编号提示
+      })).map((item: any) => ({
+        ...item,
+        alarmReason: item.alarmCategoryName.includes('浓度') ? `${item.alarmValue}${!item.alarmValue ? '' : item.watchObject === '2' ? 'PPM.M' : '%LEL'}` : (alarmValue[item.alarmValue] || '其他')
+      })).filter((item:any) => !item.alarmType.includes('故障'))
+      loadingTable.value = false
+    })
   })
-  // setTimeout(() => {
-  //   loadingTable.value = false
-  //   // list.value = [
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //   },
-  //   //   {
-  //   //     alarmType: '浓度超限',
-  //   //     deptName: '第一分公司',
-  //   //     alarmContent: '浓度20%vol',
-  //   //     alarmTime: '2024-09-10 12:01:00',
-  //   //     position: '北京西西城区前门大街',
-  //   //     status: '已确认',
-  //   //   },
-  //   // ]
-  // }, 1000)
+
 })
+
+const rowClick = (data: any) => {
+  if (!data.latGaode || !data.lngGaode) {
+    ElMessage.warning('暂无位置信息')
+    return
+  }
+  // console.log(data, '111')
+  $emit('clickMaker', {
+    ...data,
+    lnglat: [data.lngGaode, data.latGaode]
+  })
+}
 </script>
 
 <template>
   <layout :height="height" :width="width" title="当前报警" subtitle="Current Alarm">
     <template #content>
-      <div style="padding: 0 5px;">
-        <normal-table
-          :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
-          :pagination="false" :height="height - 30" :border="true"
-        />
+      <div>
+        <normal-table :data="list" :total="0" :columns="columns" :query="{}" :list-loading="loadingTable"
+          :pagination="false" :height="height - 30" :border="true" @rowDbClick="rowClick" />
       </div>
     </template>
   </layout>
@@ -135,6 +86,7 @@
   color: #ddd8d8;
   background-color: #2a2b3d;
 }
+
 ::v-deep(.el-table__body-wrapper) {
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
@@ -162,6 +114,10 @@
 
 ::v-deep(.el-table__row) {
   background-color: #5c5d6b;
+  font-size: 12px;
+  &:hover {
+    cursor: pointer;
+  }
 }
 
 ::v-deep(.el-table__row--striped) {
diff --git a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
index 8e8228f..636f3ae 100644
--- a/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
+++ b/src/views/home/dashboard/fullScreen-components/deptAlarmCount.vue
@@ -7,6 +7,8 @@
 import layout from './layout.vue'
 import { deptAlarmStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChartHorizontal from '@/components/Echart/BarChartHorizontal.vue'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -27,16 +29,6 @@
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = ['第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司']
-    data.value = [
-      {
-        name: '数量',
-        data: [54, 64, 32, 28, 43],
-      },
-    ]
-    loading.value = false
-  }, 500)
 })
 // 获取数据
 const loading = ref(true)
@@ -45,21 +37,70 @@
   data.value = []
   loading.value = true
   deptAlarmStatistics({ type: $props.type }).then((res) => {
+    // console.log(res.data, '各分公司报警统计')
+    xAxisData.value = []
+    data.value = []
     // 整理数据
-    let result = res.data || []
-    let need = ['一', '二', '三', '四', '五', '六', '高压']
-    result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
-    if (result.length > 6) {
-      result = result.slice(0, 6)
+    if (!userStore.roleTips.join().includes('admin')) {
+      res.data.forEach((element: any) => {
+        xAxisData.value.push(element.dept)
+        data.value.push(element.count)
+      });
+      data.value = [
+        {
+          name: '数量',
+          data: data.value,
+        },
+      ]
     }
-    // 截取前六个排序
-    xAxisData.value = result.map((item: any) => item.dept)
-    data.value = [
-      {
-        name: '数量',
-        data: result.map((item: any) => item.count),
-      },
-    ]
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.dept.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.dept.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      // console.log(arr, 'arr')
+      xAxisData.value = arr.map((item: any) => item.dept)
+      data.value = [
+        {
+          name: '数量',
+          data: arr.map((item: any) => Number(item.count)),
+        },
+      ]
+      // console.log(xAxisData.value, 'xAxisData.value')
+    }
+    // let need = ['一', '二', '三', '四', '五', '六', '高压']
+    // result = result.filter((item: any) => item.dept.includes('分公司') && need.some((citem) => item.dept.includes(citem)))
+    // if (result.length > 6) {
+    //   result = result.slice(0, 6)
+    // }
+    // // 截取前六个排序
+    // xAxisData.value = result.map((item: any) => item.dept)
+    // data.value = [
+    //   {
+    //     name: '数量',
+    //     data: ,
+    //   },
+    // ]
     loading.value = false
   }).catch(() => {
     loading.value = false
@@ -79,12 +120,14 @@
 </script>
 
 <template>
-  <layout v-loading="loading" class="layout" :height="height" :width="width" title="各分公司报警统计"
-    subtitle="Alarm Statistics Of Each Company">
+  <layout class="layout" :height="height" :width="width" title="各分公司报警统计" subtitle="Alarm Statistics Of Each Company">
     <template #content>
-      <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
-        label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
-        :legend="{ show: false }" font-color="#fff" />
+      <div v-loading="loading">
+        <bar-chart-horizontal-color :data="data" :x-axis-data="xAxisData" bar-width="10" :bar-coner="0"
+          label-color="#a7ceec" :show-label="true" :style="{ width: '100%', height: `${height - 30}px` }"
+          :legend="{ show: false }" font-color="#fff" />
+      </div>
+
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
index 980abff..df87104 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceAlarmTrend.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="FullScreenDeviceAlarmTrend">
 import layout from './layout.vue'
+import { alarmTrend } from '@/api/home/dashboard/fullScreen'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -13,67 +14,71 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const listQuery = ref({
-  timeType: '1',
+  timeType: '2',
 })
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
 const xAxisData = ref<any[]>([])
 const data = ref<any[]>([])
-onMounted(() => {
-  setTimeout(() => {
-    xAxisData.value = [
-      '2024-09-17',
-      '2024-09-18',
-      '2024-09-19',
-      '2024-09-20',
-      '2024-09-21',
-      '2024-09-22',
-      '2024-09-23',
-      '2024-09-24',
-    ]
+const loading = ref(false)
+
+const fetchData = () => {
+  loading.value = true
+  alarmTrend(listQuery.value).then(res => {
+    // console.log(res.data, '报警趋势')
+    xAxisData.value = []
+    data.value = []
+    res.data.forEach((element: any) => {
+      for (const i in element) {
+        xAxisData.value.push(i)
+        data.value.push(element[i])
+      }
+    });
     data.value = [
       {
         name: '报警次数',
-        data: [9, 6, 0, 12, 2, 3, 7, 0],
+        data: data.value,
         symbol: 'circle',
         color: '#E6271D',
-      },
+      }
     ]
-  }, 1000)
+    loading.value = false
+  })
+}
+watch(() => listQuery.value.timeType, (newVal) => {
+  if (newVal) {
+    fetchData()
+  }
+})
+onMounted(() => {
+  fetchData()
 })
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备报警趋势" subtitle="Equipment Alarm Trend">
     <template #content>
-      <div class="container">
+      <div class="container" v-loading="loading">
         <!-- 筛选条件 -->
         <div class="search">
-          <el-button
-            :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('1')"
-          >
+          <el-button :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('2')">
             近7日
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('2')"
-          >
+          <el-button :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('3')">
             本月
           </el-button>
-          <el-button
-            :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
-            @click="selectTimeType('3')"
-          >
+          <el-button :class="listQuery.timeType === '4' ? 'active' : ''" round size="small" style="margin: 0 5px;"
+            @click="selectTimeType('4')">
             本年
           </el-button>
         </div>
-        <line-chart
-          :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
+        <line-chart :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
           YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
             show: true,
             // icon: 'line',
@@ -86,8 +91,7 @@
             textStyle: {
               color: '#fff',
             },
-          }"
-        />
+          }" />
       </div>
     </template>
   </layout>
@@ -100,7 +104,7 @@
 
 ::v-deep(.el-button) {
   background-color: rgba($color: #103f60, $alpha: 80%);
-  border-color: #fff;
+  border-color: #856b6b;
   color: #fff;
 }
 
@@ -117,10 +121,10 @@
 
 .active {
   color: #1c3444;
-  border-color: #e6ebf5;
+  border-color: #777f8d;
   outline: none;
   font-weight: 700;
-  background-color: rgba($color: #98a7bb, $alpha: 100%);
+  background-color: rgba($color: #758292, $alpha: 100%);
 }
 
 // .layout {
@@ -133,5 +137,4 @@
 //   }
 
 //   // overflow: hidden;
-// }
-</style>
+// }</style>
diff --git a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
index fa7fb02..c74cac5 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceOnlineMonitor.vue
@@ -4,7 +4,9 @@
   Date: 2024-09-18
  -->
 <script lang="ts" setup name="FullScreenDeviceOnlineMonitor">
+import { getOffline } from '@/api/home/device/count'
 import layout from './layout.vue'
+import { color } from 'echarts'
 // 宽高
 const height = ref((window.innerHeight - 100 - 50) / 3)
 const width = ref((window.innerWidth - (window.innerWidth * 0.6) - 30) / 2)
@@ -15,62 +17,50 @@
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
 })
-const data = [
-  {
-    name: '燃气智能监测终端',
-    value: '90',
-    color: '#2391FF',
-    class: 'circle1'
-  },
-  {
-    name: '云台',
-    value: '87',
-    color: '#FF745A',
-    class: 'circle2'
-  },
-  {
-    name: '防外力破坏',
-    value: '64',
-    color: '#FFC328',
-    class: 'circle3'
-  },
-  {
-    name: '管线哨兵',
-    value: '67',
-    color: '#1AC9FF',
-    class: 'circle4'
-  },
-  {
-    name: '智能监测桩',
-    value: '88',
-    color: '#2352d6',
-    class: 'circle5'
-  },
-  {
-    name: '井盖状态监测仪',
-    value: '56',
-    color: '#19be6b',
-    class: 'circle6'
-  },
-  {
-    name: '开挖监测仪',
-    value: '40',
-    color: '#8B71ED',
-    class: 'circle7'
-  },
-  {
-    name: '液位监测仪',
-    value: '38',
-    color: '#E46CBB',
-    class: 'circle8'
-  },
-]
+const loading = ref(false)
+const colorList = ref([
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+  '#2391FF',
+  '#FF745A',
+  '#FFC328',
+  '#1AC9FF',
+  '#2352d6',
+  '#19be6b',
+  '#8B71ED',
+  '#E46CBB',
+])
+const data = ref([])
+onMounted(() => {
+  loading.value = true
+  getOffline().then(res => {
+    let response = res.data
+    if (response.length > 8) {
+      response = response.slice(0, 8)
+    }
+    data.value = response.map((item: any) => ({
+      ...item,
+      online: Number(item.deviceCount) - Number(item.offCount)
+    })).map((item: any, index: number) => ({
+      ...item,
+      value: Math.floor((Number(item.online) / Number(item.deviceCount)) * 100),
+      color: colorList.value[index]
+    }))
+    loading.value = false
+  })
+})
 </script>
 
 <template>
   <layout class="layout" :height="height" :width="width" title="设备在线监控" subtitle="Equipment Online Monitoring">
     <template #content>
-      <div class="container">
+      <div v-loading="loading" class="container " :style="{ width: `${width}px`, height: `${height - 36}px` }">
         <div v-for="item in data" :key="item.name" class="item">
           <el-progress type="circle" :percentage="item.value" :striped="true" striped-flow
             :width="(width - width * 0.22) / 4" :title="item.name" :color="item.color" :class="item.class" />
@@ -92,36 +82,43 @@
     stroke: rgba($color: #057CF7, $alpha: 0.5) !important;
   }
 }
+
 .circle2 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FF745A, $alpha: 0.5) !important;
   }
 }
+
 .circle3 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #FFC328, $alpha: 0.5) !important;
   }
 }
+
 .circle4 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #1AC9FF, $alpha: 0.5) !important;
   }
 }
+
 .circle5 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #2352d6, $alpha: 0.5) !important;
   }
 }
+
 .circle6 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #19be6b, $alpha: 0.5) !important;
   }
 }
+
 .circle7 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #8B71ED, $alpha: 0.5) !important;
   }
 }
+
 .circle8 {
   ::v-deep(.el-progress-circle__track) {
     stroke: rgba($color: #E46CBB, $alpha: 0.5) !important;
diff --git a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
index fbdefbd..a120328 100644
--- a/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
+++ b/src/views/home/dashboard/fullScreen-components/deviceRunStatus.vue
@@ -65,6 +65,7 @@
     const data2 = [] as string[]
     res.data.forEach((item: any) => {
       for (const i in item) {
+        // console.log(item)
         // console.log(i)
         xAxisData.value.push(i)
         data1.push(item[i]['1'])
@@ -105,11 +106,12 @@
 
 <template>
   <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="设备运行态势"
+     class="layout" :height="height" :width="width" title="设备运行态势"
     subtitle="Equipment Operation Status"
   >
     <template #content>
-      <line-chart
+      <div v-loading="loading">
+        <line-chart
         :data="data" :x-axis-data="xAxisData" :style="{ width: '100%', height: `${height - 30}px` }"
         YfontColor="#fff" fontColor="#fff" axisLineType="solid" axisLineColor="rgba(255,255,255,0.4)" :legend="{
           show: true,
@@ -125,6 +127,7 @@
           },
         }"
       />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
index 4e93f0e..4b4e434 100644
--- a/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
+++ b/src/views/home/dashboard/fullScreen-components/pipeNetworkType.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 综合大屏 - 数据展示- 官网类型统计
+  Description: 综合大屏 - 数据展示- 各分公司设备统计
   Author: 李亚光
   Date: 2024-09-18
  -->
@@ -7,6 +7,9 @@
 import layout from './layout.vue'
 import { pipeTypeStatistics } from '@/api/home/dashboard/fullScreen'
 import BarChart3D from '@/components/Echart/BarChart3D.vue'
+import { getDeptDevice } from '@/api/home/device/count'
+import useUserStore from '@/store/modules/user'
+const userStore = useUserStore()
 const $props = defineProps({
   type: {
     type: String,
@@ -21,35 +24,68 @@
   width.value = (window.innerWidth - (window.innerWidth * 0.6) - 30) / 2
 })
 onBeforeUnmount(() => {
-  window.addEventListener('resize', () => {})
+  window.addEventListener('resize', () => { })
 })
 const data = ref<any[]>([])
 const xAxisData = ref<any[]>([])
 
 onMounted(() => {
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  //   console.log(2000)
-  // }, 2000)
-  // setTimeout(() => {
-  //   data.value = [1212, 598, 449, 1387]
-  //   xAxisData.value = ['高压管线', '次高压管线', '中压管线', '低压管线']
-  // }, 500)
 })
 // 获取数据
 const loading = ref(true)
 const fetchData = () => {
   loading.value = true
-  pipeTypeStatistics({ type: $props.type }).then((res) => {
-    // console.log(res.data, '管网类型统计')
-    xAxisData.value = res.data.map((item: any) => item.name)
-    data.value = res.data.map((item: any) => item.value)
-    // data.value = res.data
+  getDeptDevice().then(res => {
+    // console.log(res.data, '各分公司设备统计')
+    if (!userStore.roleTips.join().includes('admin')) {
+      xAxisData.value = res.data.map((item: any) => item.name)
+      data.value = res.data.map((item: any) => item.value)
+    }
+    else {
+      const deptList = [
+        '高压管网',
+        '第一分公司',
+        '第二分公司',
+        '第三分公司',
+        '第四分公司',
+        '第五分公司',
+        '怀柔有限公司',
+        '密云有限公司',
+        '平谷有限公司',
+        '延庆有限公司',
+        '昌平有限公司',
+        '房山有限公司',
+      ]
+      // 过滤
+      const needShow = res.data.filter((item: any) => deptList.filter(citem => item.name.includes(citem)).length)
+      // 排序
+      const arr = [] as any[]
+      deptList.forEach((item: string) => {
+        const data = needShow.filter((citem: any) => citem.name.includes(item))
+        if (data.length) {
+          arr.push(data[0])
+        }
+      })
+      xAxisData.value = arr.map((item: any) => item.name)
+      data.value = arr.map((item: any) => item.value)
+
+    }
     loading.value = false
   }).catch(() => {
     loading.value = false
   })
+
+
+  // pipeTypeStatistics({ type: $props.type }).then((res) => {
+  //   // console.log(res.data, '管网类型统计')
+  //   xAxisData.value = res.data.map((item: any) => item.name)
+  //   data.value = res.data.map((item: any) => item.value)
+  //   // data.value = res.data
+  //   loading.value = false
+
+  // }).catch(() => {
+  //   loading.value = false
+  // })
 }
 watch(() => $props.type, (newVal) => {
   if (newVal) {
@@ -65,12 +101,11 @@
 </script>
 
 <template>
-  <layout
-    v-loading="loading" class="layout" :height="height" :width="width" title="管网类型统计"
-    subtitle="Official Website Type Statistics"
-  >
+  <layout class="layout" :height="height" :width="width" title="各分公司设备统计" subtitle="Device Statistics Of Each Company">
     <template #content>
-      <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      <div v-loading="loading">
+        <bar-chart3-d :x-axis-data="xAxisData" :data="data" :style="{ width: '100%', height: `${height - 30}px` }" />
+      </div>
     </template>
   </layout>
 </template>
diff --git a/src/views/home/dashboard/fullScreen.vue b/src/views/home/dashboard/fullScreen.vue
index ecfd7dc..6d61571 100644
--- a/src/views/home/dashboard/fullScreen.vue
+++ b/src/views/home/dashboard/fullScreen.vue
@@ -62,6 +62,9 @@
 
 <template>
   <div class="container-full">
+    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
+      <source src="../../../assets/fullscren/border.webm" type="video/webm">
+    </video>
     <!-- banner区域 -->
     <div class="banner">
       <div class="title">
@@ -88,9 +91,7 @@
     <control-map style="position: relative;z-index: 8;" v-if="active === 'control'" />
     <!-- 事件地图 -->
     <event-map style="position: relative;z-index: 8;" v-if="active === 'event'" />
-    <video class="video" :style="{ width: `${width}px`, height: `${height}px` }" autoplay loop muted playsinline>
-      <source src="../../../assets/fullscren/border.webm" type="video/webm">
-    </video>
+    <div class="title-logo"></div>
   </div>
 </template>
 
@@ -99,6 +100,17 @@
   background-color: rgba($color: #0b0b0f, $alpha: 95%);
 }
 
+.title-logo {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 15;
+  width: 34%;
+  height: 65px;
+  background: url("@/assets/fullscren/title-logo.png") no-repeat center center;
+}
+
 .video {
   position: absolute;
   z-index: 10;
@@ -117,12 +129,7 @@
   position: relative;
   // background-color: #010102;
   background: url("@/assets/fullscren/bg.png") no-repeat center center / cover;
-  // background: url("@/assets/fullscren/border.webm") no-repeat center center / cover;
-  // background-video: url('@/assets/fullscren/bg.png');
-  // background-size: cover;
-  // background-repeat: no-repeat;
-  // background-position: center;
-  // background-attachment: fixed;
+
 
   .banner {
     position: absolute;
@@ -131,7 +138,7 @@
     z-index: 9;
     height: 65px;
     width: 100%;
-    background: url("@/assets/fullscren/banner-logo.png") no-repeat;
+    background: url("@/assets/fullscren/banner-bg.png") no-repeat;
     background-size: cover;
 
     .title {
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 99ad796..faa1bde 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -27,7 +27,7 @@
   })
 
 }
-// 泄露监测概括数据
+// 泄漏监测概括数据
 const leakageData = ref({
   total: '0',
   normal: '0',
@@ -81,7 +81,7 @@
     // 整理数据
     const data = res.data
     for(const i in data) {
-    // 泄露监测概括数据
+    // 泄漏监测概括数据
      for(const y in leakageData.value) {
       if(i.toLocaleLowerCase().includes('leak') && i.toLocaleLowerCase().includes(y)) {
         leakageData.value[y] = data[i]
diff --git a/src/views/home/device/device/components/dataSearch.vue b/src/views/home/device/device/components/dataSearch.vue
index e701d2e..3f4e115 100644
--- a/src/views/home/device/device/components/dataSearch.vue
+++ b/src/views/home/device/device/components/dataSearch.vue
@@ -53,7 +53,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const handlerthreshold = ref<any[]>([])  // 报警阈值
 // 列表loading
@@ -126,7 +126,7 @@
 // 场站监测云台
 const columns4 = ref<any>([
   { text: '设备编号', value: 'deviceCode', align: 'center' },
-  { text: '浓度', value: 'concentration', align: 'center' },
+  { text: '浓度(PPM.M)', value: 'concentration', align: 'center' },
   { text: '水平位置', value: 'dircetion', align: 'center' },
   { text: '垂直位置', value: 'pitch', align: 'center' },
   // { text: '采集时间', value: 'uptime', align: 'center' },
diff --git a/src/views/home/device/device/components/electricityAnalyse.vue b/src/views/home/device/device/components/electricityAnalyse.vue
index d24b0a3..e8101f9 100644
--- a/src/views/home/device/device/components/electricityAnalyse.vue
+++ b/src/views/home/device/device/components/electricityAnalyse.vue
@@ -11,7 +11,7 @@
 const $route = useRoute()
 const listQuery = ref({
   devcode: '',
-  beginTime: '',
+  begTime: '',
   endTime: '',
   typeName: '',
 })
@@ -21,11 +21,11 @@
 // 时间查询条件
 const timerangForReport = ref<string[]>([])
 watch(() => timerangForReport.value, (newVal) => {
-  listQuery.value.beginTime = ''
+  listQuery.value.begTime = ''
   listQuery.value.endTime = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.beginTime = `${newVal[0]}`
+      listQuery.value.begTime = `${newVal[0]}`
       listQuery.value.endTime = `${newVal[1]}`
     }
   }
@@ -44,7 +44,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   const result = JSON.parse($route.query.row as string)
@@ -59,7 +59,7 @@
     data.value = [
       {
         name: '电量/电压',
-        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)).reverse(),
+        data: JSON.parse(JSON.stringify(list.value)).slice().reverse().map((item: any) => Number.parseFloat(item.cell)),
         symbol: 'none',
       },
     ]
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index 578e302..8049285 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -156,7 +156,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDevice([row.id]).then((response) => {
+    removeDevice([row.id], [row.devcode]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -501,7 +501,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="170">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm($route.path.includes('meet') ? '/meet/detail' : '/device/manage/detail')"
+              <el-button
                 type="primary" link size="small" @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 1c06d93..60a49b5 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -362,9 +362,9 @@
       <template #btns-right>
         <!-- 操作 -->
         <div>
-          <!-- <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
+          <el-button v-if="proxy.hasPerm('/device/instruction/batch')" type="primary">
             批量下发
-          </el-button> -->
+          </el-button>
           <el-button v-if="proxy.hasPerm('/device/instruction/add')" type="primary" @click="editRow('add', {})">
             新建
           </el-button>
@@ -395,14 +395,14 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/instruction/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
+              <!-- <el-button v-if="proxy.hasPerm('/device/instruction/again') && scope.row.status === '2'" type="primary"
                 link size="small" @click="editRow('edit', scope.row)">
                 重新下发
-              </el-button>
+              </el-button> -->
               <el-button v-if="proxy.hasPerm('/device/instruction/delete')" type="danger" link size="small"
                 @click="removeRow(scope.row)">
                 删除
diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
index 8b6023b..2cd361f 100644
--- a/src/views/home/device/product/components/editDialog.vue
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -120,7 +120,7 @@
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
       disabledBtn.value = true
-      editProduct(dataForm.value).then((response) => {
+      editProduct({...dataForm.value, ts: ''}).then((response) => {
         if (response.code === 200) {
           ElMessage({
             message: '修改成功',
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 4d9b194..a2f9348 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -90,7 +90,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeProduct([row.id]).then((response) => {
+    removeProduct([row.id], [row.productName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index 59fd079..ebfd401 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -83,7 +83,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeDeviceType([row.id]).then((response) => {
+    removeDeviceType([row.id], [row.typeName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
@@ -116,19 +116,18 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="fetchData" @clear="reset">
       <search-item>
-        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;"/>
+        <el-input v-model="listQuery.deviceTypeName" placeholder="设备类型" clearable style="width: 162px;" />
       </search-item>
       <search-item>
-        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select" style="width: 162px;">
+        <el-select v-model="listQuery.isUsed" placeholder="是否启用" filterable clearable class="select"
+          style="width: 162px;">
           <el-option v-for="item in isUsed" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
     </search-area>
     <!-- 表头标题 -->
-    <table-container
-      :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
-      :edit="editColumns"
-    >
+    <table-container :is-config="true" config-title="device-type" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns">
       <template #btns-right>
         <!-- 操作 -->
         <div>
@@ -138,10 +137,8 @@
         </div>
       </template>
       <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
-        @change="changePage"
-      >
+      <normal-table :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage">
         <template #preColumns>
           <el-table-column label="序号" width="80" align="center">
             <template #default="scope">
@@ -152,10 +149,12 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="120">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small" @click="editRow('edit', scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/update')" type="primary" link size="small"
+                @click="editRow('edit', scope.row)">
                 编辑
               </el-button>
-              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small" @click="removeRow(scope.row)">
+              <el-button v-if="proxy.hasPerm('/device/type/delete')" type="danger" link size="small"
+                @click="removeRow(scope.row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/home/force/index.vue b/src/views/home/force/index.vue
index adeed11..b75d264 100644
--- a/src/views/home/force/index.vue
+++ b/src/views/home/force/index.vue
@@ -92,7 +92,7 @@
     const onlineStateDict = {
       1: '正常',
       2: '报警',
-      3: '故障(离线)',
+      3: '故障',
       0: '故障(离线)',
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
@@ -443,7 +443,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
         </el-select>
       </search-item>
       <search-item>
diff --git a/src/views/home/leakage/components/map.vue b/src/views/home/leakage/components/map.vue
index 16ef720..e28eebe 100644
--- a/src/views/home/leakage/components/map.vue
+++ b/src/views/home/leakage/components/map.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测-地图
+  Description: 泄漏监测-地图
   Author: 李亚光
   Date: 2025-03-25
  -->
diff --git a/src/views/home/leakage/index.vue b/src/views/home/leakage/index.vue
index e96e456..5c9f1cf 100644
--- a/src/views/home/leakage/index.vue
+++ b/src/views/home/leakage/index.vue
@@ -1,5 +1,5 @@
 <!--
-  Description: 泄露监测
+  Description: 泄漏监测
   Author: 李亚光
   Date: 2025-03-24
  -->
@@ -100,7 +100,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     const typeDict = {
       1: '闸井',
@@ -475,7 +475,7 @@
           <!-- <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" /> -->
           <el-option key="1" label="正常" value="1" />
           <el-option key="2" label="报警" value="2" />
-          <el-option key="3" label="故障(离线)" value="0,3" />
+          <el-option key="3" label="故障" value="0,3" />
           <!-- <el-option key="0" label="未监控" value="0" /> -->
         </el-select>
       </search-item>
diff --git a/src/views/home/ledger/ledger/components/gridList.vue b/src/views/home/ledger/ledger/components/gridList.vue
index 3b71726..5580e8b 100644
--- a/src/views/home/ledger/ledger/components/gridList.vue
+++ b/src/views/home/ledger/ledger/components/gridList.vue
@@ -18,7 +18,7 @@
   { text: '管理单位', value: 'deptName', align: 'center', isRequired: true },
   { text: '负责人', value: 'principal', align: 'center', width: '100' },
   { text: '负责人联系电话', value: 'telephone', align: 'center', width: '200' },
-  { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
+  // { text: '压力级制', value: 'pressType', align: 'center', isRequired: true },
   { text: '管线长度', value: 'pipeLength', align: 'center', isRequired: true, width: '140' },
   { text: '坐标状态', value: 'locationStateName', align: 'center', isRequired: true, width: '90' },
 ])
@@ -161,7 +161,7 @@
           </el-table-column>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
+          <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
               <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
diff --git a/src/views/home/ledger/ledger/components/wellList.vue b/src/views/home/ledger/ledger/components/wellList.vue
index c836e41..4c628a9 100644
--- a/src/views/home/ledger/ledger/components/wellList.vue
+++ b/src/views/home/ledger/ledger/components/wellList.vue
@@ -183,7 +183,7 @@
         <template #columns>
           <el-table-column v-if="proxy.hasPerm('/ledger/sync/single')" label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/single')" type="primary" link size="small" @click="sync('single', scope.row)">
+              <el-button type="primary" link size="small" @click="sync('single', scope.row)">
                 同步
               </el-button>
             </template>
diff --git a/src/views/home/ledger/ledger/index.vue b/src/views/home/ledger/ledger/index.vue
index 2006045..78c176b 100644
--- a/src/views/home/ledger/ledger/index.vue
+++ b/src/views/home/ledger/ledger/index.vue
@@ -8,15 +8,7 @@
 import wellList from './components/wellList.vue'
 import gridList from './components/gridList.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/ledger/manage/well')
-    ? '闸井'
-    : proxy.hasPerm('/ledger/manage/station')
-      ? '场站'
-      : proxy.hasPerm('/ledger/manage/grid')
-        ? '网格'
-        : '',
-)
+const activeName = ref('闸井')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -27,14 +19,14 @@
   <app-container>
     <div class="tabs">
       <el-tabs v-model="activeName" type="border-card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/well')" label="闸井" name="闸井">
-          <well-list v-if="activeName === '闸井'" type="1" />
+        <el-tab-pane label="闸井" name="闸井">
+          <well-list v-show="activeName === '闸井'" type="1" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/station')" label="场站" name="场站">
-          <well-list v-if="activeName === '场站'" type="2" />
+        <el-tab-pane label="场站" name="场站">
+          <well-list v-show="activeName === '场站'" type="2" />
         </el-tab-pane>
-        <el-tab-pane v-if="proxy.hasPerm('/ledger/manage/grid')" label="网格" name="网格">
-          <grid-list v-if="activeName === '网格'" />
+        <el-tab-pane label="网格" name="网格">
+          <grid-list v-show="activeName === '网格'" />
         </el-tab-pane>
       </el-tabs>
     </div>
diff --git a/src/views/home/ledger/location/index.vue b/src/views/home/ledger/location/index.vue
index e24bfee..a2665b4 100644
--- a/src/views/home/ledger/location/index.vue
+++ b/src/views/home/ledger/location/index.vue
@@ -86,7 +86,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeLocation([row.id]).then((response) => {
+    removeLocation([row.id], [row.tagNumber]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 70df9c8..00387ea 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -164,7 +164,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="100">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/ledger/sync/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detailRow(scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/operation/alarm/components/detail.vue b/src/views/home/operation/alarm/components/detail.vue
index 6111413..75491ff 100644
--- a/src/views/home/operation/alarm/components/detail.vue
+++ b/src/views/home/operation/alarm/components/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index e1ddad2..590cee3 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -564,7 +564,7 @@
               </span>
             </template>
             <template #columns>
-              <el-table-column v-if="proxy.hasPerm('/alarm/device/detail')" label="操作" align="center" width="60">
+              <el-table-column label="操作" align="center" width="60">
                 <template #default="scope">
                   <el-button type="primary" link size="small" @click="detail(scope.row)">
                     查看
diff --git a/src/views/home/operation/history/detail.vue b/src/views/home/operation/history/detail.vue
index 9bd8873..5834598 100644
--- a/src/views/home/operation/history/detail.vue
+++ b/src/views/home/operation/history/detail.vue
@@ -175,7 +175,7 @@
       ElMessage.warning('缺少设备关键信息')
       return
     }
-    if (!proxy.hasPerm('/device/manage/detail/menu')) {
+    if (!proxy.hasPerm('/device/manage')) {
       ElMessage.warning('没有对应权限菜单')
       return
     }
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 3b2e862..4299b8b 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -307,7 +307,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/history/detail')" label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detailRow(scope.row)">
                 查看
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 05787f1..42678db 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -182,7 +182,7 @@
           </span>
         </template>
         <template #columns>
-          <el-table-column v-if="proxy.hasPerm('/operation/trajectory/detail')" label="操作" width="60" align="center">
+          <el-table-column label="操作" width="60" align="center">
             <template #default="scope">
               <el-button type="primary" link size="small" @click="detail(scope.row)">
                 查看
diff --git a/src/views/home/pipeline/components/detailData.vue b/src/views/home/pipeline/components/detailData.vue
index 5220835..ffc96f9 100644
--- a/src/views/home/pipeline/components/detailData.vue
+++ b/src/views/home/pipeline/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue
index 2e48cf6..51e8129 100644
--- a/src/views/home/pipeline/components/detailInfoDialog.vue
+++ b/src/views/home/pipeline/components/detailInfoDialog.vue
@@ -33,11 +33,11 @@
     value: 'manufactureName',
     align: 'center'
   },
-  {
-    text: '压力级制',
-    value: 'pressType',
-    align: 'center'
-  },
+  // {
+  //   text: '压力级制',
+  //   value: 'pressType',
+  //   align: 'center'
+  // },
   {
     text: '管径(mm)',
     value: 'pipeDiameter',
@@ -54,6 +54,11 @@
     align: 'center'
   },
   {
+    text: '安装位号',
+    value: 'tagNumber',
+    align: 'center'
+  },
+  {
     text: '详细位置',
     value: 'position',
     align: 'center'
@@ -77,11 +82,7 @@
 ])
 // 描述列表数据
 const descriptionsList = ref([
-  {
-    text: '安装位号',
-    value: 'tagNumber',
-    align: 'center'
-  },
+
   {
     text: '负责人',
     value: 'personName',
diff --git a/src/views/home/pipeline/components/gasDataDialog.vue b/src/views/home/pipeline/components/gasDataDialog.vue
index 2b6c7ff..47d589a 100644
--- a/src/views/home/pipeline/components/gasDataDialog.vue
+++ b/src/views/home/pipeline/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/components/monitorDataList.vue b/src/views/home/pipeline/components/monitorDataList.vue
index c2f4ac3..4eb8c05 100644
--- a/src/views/home/pipeline/components/monitorDataList.vue
+++ b/src/views/home/pipeline/components/monitorDataList.vue
@@ -151,7 +151,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/pipeline/index.vue b/src/views/home/pipeline/index.vue
index 4b110d6..c654da5 100644
--- a/src/views/home/pipeline/index.vue
+++ b/src/views/home/pipeline/index.vue
@@ -32,7 +32,7 @@
 const pipeAllData = ref([])
 // 初始展示列
 const columns = ref<any>([
-  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '110' },
+  { text: '安装位号', value: 'tagNumber', align: 'center', isRequired: true, width: '130' },
   { text: '设备编号', value: 'devcode', isRequired: true, align: 'center', isCustom: true },
   { text: '设备类型', value: 'typeName', isRequired: true, align: 'center' },
   // { text: '关联管线', value: 'pipeCode', isRequired: true, align: 'center' },
@@ -631,7 +631,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/rule/agreement/index.vue b/src/views/home/rule/agreement/index.vue
index cf77392..4ac3fe9 100644
--- a/src/views/home/rule/agreement/index.vue
+++ b/src/views/home/rule/agreement/index.vue
@@ -81,7 +81,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAgreement([row.id]).then((response) => {
+    removeAgreement([row.id], [row.protocolName]).then((response) => {
       if (response.code === 200) {
         ElMessage({
           message: '删除成功',
diff --git a/src/views/home/rule/alarm/index.vue b/src/views/home/rule/alarm/index.vue
index 96f8db0..0fb655e 100644
--- a/src/views/home/rule/alarm/index.vue
+++ b/src/views/home/rule/alarm/index.vue
@@ -128,7 +128,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeAlarmRule(row.id).then(() => {
+    removeAlarmRule(row.id, row.alarmName).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
diff --git a/src/views/home/rule/special/index.vue b/src/views/home/rule/special/index.vue
index 9528fcd..8c6d982 100644
--- a/src/views/home/rule/special/index.vue
+++ b/src/views/home/rule/special/index.vue
@@ -87,7 +87,7 @@
       type: 'warning',
     },
   ).then(() => {
-    removeSpecialAlarmRule(row.ids.split(',')).then(() => {
+    removeSpecialAlarmRule(row.ids.split(','), [row.devcode]).then(() => {
       ElMessage.success('操作成功')
       fetchData()
     })
@@ -148,7 +148,7 @@
         <template #columns>
           <el-table-column label="操作" width="140" align="center">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/rule/special/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="detail('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/control/index.vue b/src/views/home/station/control/index.vue
index e3f3173..1da7bac 100644
--- a/src/views/home/station/control/index.vue
+++ b/src/views/home/station/control/index.vue
@@ -64,7 +64,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const loading = ref(false)
 // 点击树形结构
@@ -179,11 +179,11 @@
 // 获取echarts数据
 function fetchEchartsData(obj: any) {
   getDeviceGasData(obj).then(res => {
-    xAxisData.value = (res.data || []).map((item: any) => item.LOGTIME)
+    xAxisData.value = (res.data || []).slice().map((item: any) => item.LOGTIME)
     data.value = [
       {
         name: '浓度',
-        data: (res.data || []).map((item: any) => item.CONCENTRATION || '0'),
+        data: (res.data || []).slice().map((item: any) => item.CONCENTRATION || '0'),
         symbol: res.data.length > 1 ? 'none' : 'circle',
       },
     ]
@@ -276,7 +276,7 @@
               </div>
             </div>
             <div class="right1">
-              <el-card v-if="proxy.hasPerm('/station/control/video')" shadow="always">
+              <el-card  shadow="always">
                 <template #header>
                   <div class="clearfix">
                     <div>云台控制</div>
diff --git a/src/views/home/station/station/components/detailData.vue b/src/views/home/station/station/components/detailData.vue
index 6bee38e..ab1be8a 100644
--- a/src/views/home/station/station/components/detailData.vue
+++ b/src/views/home/station/station/components/detailData.vue
@@ -9,12 +9,7 @@
 import lifeCycleRecord from '@/views/home/well/components/lifeCycleRecord.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/station/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/station/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/station/monitor/maintenance') ? '监控设备维护记录' : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -22,10 +17,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/station/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record v-if="activeName === '全生命周期记录'" />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/station/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue
index 7a09173..c98a38f 100644
--- a/src/views/home/station/station/components/detailInfoDialog.vue
+++ b/src/views/home/station/station/components/detailInfoDialog.vue
@@ -26,7 +26,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const deviceList = ref<any[]>([])
 const currentVideo = ref('')
diff --git a/src/views/home/station/station/components/monitorDataGasList.vue b/src/views/home/station/station/components/monitorDataGasList.vue
index b973e0a..2e87da5 100644
--- a/src/views/home/station/station/components/monitorDataGasList.vue
+++ b/src/views/home/station/station/components/monitorDataGasList.vue
@@ -56,7 +56,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = (real = false) => {
   if (!real) {
@@ -67,9 +67,9 @@
     begTime: listQuery.value.begTime,
     endTime: listQuery.value.endTime,
   }).then(res => {
-    list.value = (res.data || []).reverse()
+    list.value = (res.data || [])
     const handlerData = () => {
-      xAxisData.value = list.value.map((item: any) => item.LOGTIME).reverse()
+      xAxisData.value = JSON.parse(JSON.stringify(list.value.map((item: any) => item.LOGTIME)))
       let markLineData = [] as any[]
       // 判断阈值
       const handlerthresholdFun = (value: string, threshold: string[]) => {
@@ -94,10 +94,42 @@
         ...item,
         status: handlerthresholdFun(item.CONCENTRATION, handlerthreshold.value.map((item: any) => item.alarmThreshold)),
       }) as any)
+      // console.log(markLineData, 'markLineData')
+      const indexDict = {
+          1: '一',
+          2: '二',
+          3: '三',
+          4: '其它',
+          5: '其它',
+          6: '其它',
+          7: '其它',
+        } as { [key: string]: any }
+        const colorDict = {
+          1: '#f56c6c',
+          2: '#ee9611',
+          3: '#ffd700',
+          4: '#8dc6ea',
+          5: '#8dc6ea',
+          6: '#8dc6ea',
+          7: '#8dc6ea',
+        } as { [key: string]: any }
+      markLineData = handlerthreshold.value.map((item: any) => item.alarmThreshold).map((item: string, index: number) => ({
+          name: `${indexDict[index + 1]}级报警阈值:${Number(item)}PPM.M`,
+          yAxis: Number(item),
+          lineStyle: {
+            color: colorDict[index + 1],
+            join: 'round',
+            cap: 'round',
+          },
+          label: {
+            show: true,
+            formatter: '{b}'
+          }
+        }))
       data.value = [
         {
           name: '浓度',
-          data: JSON.parse(JSON.stringify(list.value)).reverse().map((item: any) => item.CONCENTRATION || '0'),
+          data: JSON.parse(JSON.stringify(list.value)).map((item: any) => item.CONCENTRATION || '0'),
           symbol: list.value.length > 1 ? 'none' : 'circle',
           markLine: {
             data: markLineData,
@@ -111,6 +143,8 @@
         },
       ]
 
+      list.value = list.value.slice().reverse()
+
     }
     if (isThreshold.value) {
       handlerData()
@@ -287,7 +321,7 @@
         :grid="{
           top: 50,
           left: 60,
-          right: 130,
+          right: 150,
           bottom: 20,
           containLabel: true, // 是否包含坐标轴的刻度标签
         }" />
diff --git a/src/views/home/station/station/components/videoControl.vue b/src/views/home/station/station/components/videoControl.vue
index 3ec3b9d..0bd414d 100644
--- a/src/views/home/station/station/components/videoControl.vue
+++ b/src/views/home/station/station/components/videoControl.vue
@@ -77,7 +77,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const complete = () => {
   resizePage()
@@ -151,6 +151,7 @@
 onMounted(() => {
   resizePage()
 })
+const { proxy } = getCurrentInstance() as any
 </script>
 
 <template>
@@ -176,7 +177,7 @@
       <!-- 云台控制按钮 -->
       <div>
         <div class="control-btn">
-          <control-btn :deviceId="currentDeviceId" />
+          <control-btn v-if="proxy.hasPerm('/station/control')" :deviceId="currentDeviceId" />
         </div>
       </div>
     </div>
diff --git a/src/views/home/station/station/index.vue b/src/views/home/station/station/index.vue
index 1224210..b781e32 100644
--- a/src/views/home/station/station/index.vue
+++ b/src/views/home/station/station/index.vue
@@ -492,7 +492,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/station/monitor/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/station/video/index.vue b/src/views/home/station/video/index.vue
index 4b32a26..521f3c6 100644
--- a/src/views/home/station/video/index.vue
+++ b/src/views/home/station/video/index.vue
@@ -20,6 +20,8 @@
   label: 'name',
   value: 'id'
 }
+
+
 const playRef1 = ref()
 const playRef2 = ref()
 const playRef3 = ref()
@@ -52,43 +54,58 @@
   })
 }
 const treeData = ref<any[]>([])
-const videoList = ref([{}, {}, {}, {}])
+const videoList = ref([])
 const expandedKeys = ref<string[]>([]) // 默认展开的节点
 const treeRef = ref()
 // 点击树形结构
 const handleNodeClick = (data: any, status: boolean) => {
-  if(!data.DEVCODE && status) {
+  if (!data.DEVCODE && status) {
     ElMessage.warning('设备编号为空')
     treeRef.value.setChecked(data.id, false)
     return
   }
   if (data.id.includes('station') && status) {
-    // 点击的设备(加载视频)
-    // console.log('station', data)
-    // data.DEVCODE = 'WXD7507'
-    // 添加到视频数组
-    if (videoList.value.filter((item) => item.id).length === 4) {
-      treeRef.value.setChecked(videoList.value[3].id, false)
+    if (videoList.value.filter((item: any) => item.name).length === 4) {
+      ElMessage.warning('最多同时查看4台设备')
+      treeRef.value.setChecked(data.id, false)
+      return
     }
-    videoList.value.unshift(data)
-    // 播放当前
-    playerVideo(data.DEVCODE, playRef1.value)
-    videoList.value.pop()
-    videoList.value.forEach((item,index) => {
-       if(item.id && index!== 0) {
-        const dict = {
+    const player = () => {
+      console.log(videoList.value)
+      const index = videoList.value.findIndex((item: any) => !item.name)
+      console.log(index, '需要播放')
+      if (index !== -1) {
+        videoList.value[index] = data
+      }
+      else {
+        videoList.value.push(data)
+      }
+      setTimeout(() => {
+        const plater = {
+          0: playRef1.value,
           1: playRef2.value,
           2: playRef3.value,
-          3: playRef4.value
+          3: playRef4.value,
         }
-        playerVideo(item.DEVCODE, dict[index])
-       }
-    })
-
+        playerVideo(data.DEVCODE, index === -1 ? plater[videoList.value.length - 1] : plater[index])
+      }, 100)
+    }
+    if (videoList.value.filter((item: any) => item.name).length < 4) {
+      player()
+    }
+    else {
+      player()
+      // treeRef.value.setChecked(videoList.value[0].id, false)
+      // unref(playerRef.value[0]).playerFun.stopAllPlay()
+      // videoList.value.shift()
+      // setTimeout(() => {
+      //   player()
+      // })
+    }
   }
   else if (data.id.includes('station') && !status) {
-    videoList.value = videoList.value.filter((item) => item.id !== data.id)
-    videoList.value.push({})
+    const index = videoList.value.findIndex((item) => item.id === data.id)
+    videoList.value[index] = {}
   }
 }
 // 查询组织机构
@@ -210,9 +227,6 @@
       <div ref="tableContainer" class="table">
         <el-card class="box-card" shadow="always">
           <div style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-            <!-- <video v-for="item in 4" :key="item" class="video" :class="`${item <= 2 ? 'mar-bottom' : ''}`" src=""
-              controls autoplay /> -->
-            <!-- videoList -->
             <div class="video mar-bottom">
               <span class="title">{{ videoList[0]?.name }}</span>
               <player v-if="videoList[0]?.name" :playId="`video-player-${0}`" ref="playRef1" @error="playerError" />
@@ -235,8 +249,10 @@
             </div>
             <!-- <div v-for="(item, index) in videoList" class="video" :class="`${index <= 2 ? 'mar-bottom' : ''}`">
               <span class="title">{{ item.name }}</span>
-              <player :playId="`video-player-${index}`" :ref="`playRef${index + 1}`" @error="playerError" />
-            </div> -->
+              <player :playId="`video-player-${index}`" ref="playerRef" @error="playerError" />
+            </div>
+            <div v-for="item in 4 - videoList.length" :key="item" class="video"
+              :class="`${item <= 2 ? 'mar-bottom' : ''}`" style="background-color: #000;"></div> -->
           </div>
         </el-card>
       </div>
diff --git a/src/views/home/temporary/components/detailData.vue b/src/views/home/temporary/components/detailData.vue
index 760b1c5..ffc96f9 100644
--- a/src/views/home/temporary/components/detailData.vue
+++ b/src/views/home/temporary/components/detailData.vue
@@ -8,12 +8,7 @@
 import monitorData from './monitorDataList.vue'
 import maintenanceRecord from '@/views/home/well/components/maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/pipeline/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/pipeline/monitor/maintenance')
-      ? '监控设备维护记录'
-      : '')
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -21,10 +16,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data v-if="activeName === '监控数据'" />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/pipeline/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
+    <el-tab-pane label="监控设备维护记录" name="监控设备维护记录">
       <maintenance-record v-if="activeName === '监控设备维护记录'" />
     </el-tab-pane>
   </el-tabs>
diff --git a/src/views/home/temporary/components/detailInfoDialog.vue b/src/views/home/temporary/components/detailInfoDialog.vue
index 8b4c2a1..aa3bcf0 100644
--- a/src/views/home/temporary/components/detailInfoDialog.vue
+++ b/src/views/home/temporary/components/detailInfoDialog.vue
@@ -123,9 +123,9 @@
   loading.value = true
   gasData.value = []
   if (
-    rowData.value.deviceTypeName.includes('燃气智能监测终端') ||
-    rowData.value.deviceTypeName.includes('管网哨兵') ||
-    rowData.value.deviceTypeName.includes('智能警示桩')
+    rowData.value.deviceTypeName?.includes('燃气智能监测终端') ||
+    rowData.value.deviceTypeName?.includes('管网哨兵') ||
+    rowData.value.deviceTypeName?.includes('智能警示桩')
   ) {
     // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return }
     descriptionsList.value = descriptionsList.value.filter(
@@ -152,7 +152,7 @@
       if (res.data.locationCategory) {
         detailInfo.value.locationCategoryName = locationTypeList.value.filter(citem => citem.value === res.data.locationCategory)[0]?.name || ''
       }
-      if (!(rowData.value.deviceTypeName.includes('燃气智能监测终端') || rowData.value.deviceTypeName.includes('管网哨兵') || rowData.value.deviceTypeName.includes('智能警示桩'))) {
+      if (!(rowData.value.deviceTypeName?.includes('燃气智能监测终端') || rowData.value.deviceTypeName?.includes('管网哨兵') || rowData.value.deviceTypeName?.includes('智能警示桩'))) {
         return
       }
       if(res.data.installDate) {
@@ -160,12 +160,12 @@
      }
       //
       if (detailInfo.value.onlineState) {
-        detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
+        // detailInfo.value.onlineState  = detailInfo.value.onlineState === '0' ? '3' : detailInfo.value.onlineState
         const onLineDict = {
           '1': '正常',
           '0': '故障(离线)',
           '2': '报警',
-          '3': '故障(离线)',
+          '3': '故障',
         } as { [key: string]: string }
         detailInfo.value.monitorStateName = onLineDict[detailInfo.value.onlineState] || ' '
       }
@@ -176,7 +176,7 @@
       }).then(res => {
         gasData.value = []
         for (const i in res.data) {
-          if (res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')) {
+          if (res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')) {
             gasData.value.push({
               name: res.data[i].devTypeName,
               devcode: res.data[i].devcode,
@@ -185,14 +185,14 @@
               offDays: res.data[i].offDays,
               alarmContent: res.data[i].alarmContent,
               text:
-                res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩')
+                res.data[i].devTypeName?.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩')
                   ? '燃气浓度'
-                  : res.data[i].devTypeName.includes('液位')
+                  : res.data[i].devTypeName?.includes('液位')
                     ? '液位状态'
-                    : res.data[i].devTypeName.includes('井盖')
+                    : res.data[i].devTypeName?.includes('井盖')
                       ? '井盖状态'
                       : '',
-              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName.includes('管网哨兵') || res.data[i].devTypeName.includes('智能警示桩') ? '%LEL' : '',
+              unit: res.data[i].devTypeName.includes('燃气') || res.data[i].devTypeName?.includes('管网哨兵') || res.data[i].devTypeName?.includes('智能警示桩') ? '%LEL' : '',
               stateName:
                 res.data[i].state === '1'
                   ? '正常'
@@ -205,7 +205,7 @@
 
           }
         }
-        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName.includes(item.name) || item.name.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
+        gasData.value = gasData.value.filter(item => (item.name === rowData.value.deviceTypeName || rowData.value.deviceTypeName?.includes(item.name) || item.name?.includes(rowData.value.deviceTypeName)) && item.devcode === detailInfo.value.devcode)
         if (gasData.value.length) {
           detailInfo.value.offDays = gasData.value[0].offDays
           detailInfo.value.alarmContent = gasData.value[0].alarmContent
@@ -296,7 +296,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
@@ -315,7 +315,7 @@
               color:
                 detailInfo[item.value] === '正常'
                   ? '#3cc53c'
-                  : detailInfo[item.value] === '故障(离线)'
+                  : detailInfo[item.value]?.includes('故障') || detailInfo[item.value]?.includes('离线')
                     ? 'rgb(238, 182, 78)'
                     : detailInfo[item.value] === '异常'
                       ? 'red'
diff --git a/src/views/home/temporary/components/gasDataDialog copy.vue b/src/views/home/temporary/components/gasDataDialog copy.vue
index ac3f714..6b8d668 100644
--- a/src/views/home/temporary/components/gasDataDialog copy.vue
+++ b/src/views/home/temporary/components/gasDataDialog copy.vue
@@ -202,7 +202,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/gasDataDialog.vue b/src/views/home/temporary/components/gasDataDialog.vue
index d3b10f7..f47f1e3 100644
--- a/src/views/home/temporary/components/gasDataDialog.vue
+++ b/src/views/home/temporary/components/gasDataDialog.vue
@@ -209,7 +209,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/components/monitorDataList.vue b/src/views/home/temporary/components/monitorDataList.vue
index 28d6b4d..c264704 100644
--- a/src/views/home/temporary/components/monitorDataList.vue
+++ b/src/views/home/temporary/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/temporary/index.vue b/src/views/home/temporary/index.vue
index 88cdba4..8a76eb9 100644
--- a/src/views/home/temporary/index.vue
+++ b/src/views/home/temporary/index.vue
@@ -102,7 +102,7 @@
       0: '故障(离线)',
       1: '正常',
       2: '报警',
-      3: '故障(离线)'
+      3: '故障'
     } as { [key: string]: string }
     list.value = res.data.rows.map((item: any) => ({
       ...item,
@@ -308,7 +308,7 @@
       id: '2'
     },
     {
-      name: '故障(离线)',
+      name: '故障',
       value: '0,3',
       id: '3'
     },
@@ -595,7 +595,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/pipeline/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/home/well/components/detailData.vue b/src/views/home/well/components/detailData.vue
index 4a40fde..6e15284 100644
--- a/src/views/home/well/components/detailData.vue
+++ b/src/views/home/well/components/detailData.vue
@@ -9,13 +9,7 @@
 import lifeCycleRecord from './lifeCycleRecord.vue'
 import maintenanceRecord from './maintenanceRecord.vue'
 const { proxy } = getCurrentInstance() as any
-const activeName = ref(
-  proxy.hasPerm('/well/monitor/data')
-    ? '监控数据'
-    : proxy.hasPerm('/well/monitor/life')
-      ? '全生命周期记录'
-      : proxy.hasPerm('/well/monitor/maintenance') ? '监控设备维护记录' : '',
-)
+const activeName = ref('监控数据')
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   // console.log(tab, event)
 }
@@ -26,10 +20,10 @@
 
 <template>
   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/data')" label="监控数据" name="监控数据">
+    <el-tab-pane label="监控数据" name="监控数据">
       <monitor-data />
     </el-tab-pane>
-    <el-tab-pane v-if="proxy.hasPerm('/well/monitor/life')" label="全生命周期记录" name="全生命周期记录">
+    <el-tab-pane label="全生命周期记录" name="全生命周期记录">
       <life-cycle-record />
     </el-tab-pane>
     <el-tab-pane v-if="proxy.hasPerm('/well/monitor/maintenance')" label="监控设备维护记录" name="监控设备维护记录">
diff --git a/src/views/home/well/components/detailInfoDialog.vue b/src/views/home/well/components/detailInfoDialog.vue
index a6dec39..5080fe0 100644
--- a/src/views/home/well/components/detailInfoDialog.vue
+++ b/src/views/home/well/components/detailInfoDialog.vue
@@ -261,9 +261,9 @@
       </div>
     </div>
     <!-- 燃气浓度等信息 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
-      <div v-for="item in gasData" v-show="item.text" :key="item.name" class="gas-item">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
+      <div v-for="item, index in gasData" :key="`${item.state}${item.index}${item.text}${item.name}${item.value}`" v-show="item.text"  class="gas-item">
         <div>
           {{ item.text }} :
           <span
@@ -280,12 +280,12 @@
       </div>
     </div>
     <!-- 感知设备运行情况 -->
-    <div v-if="gasData.length" class="dirver" style="margin-top: 10px;" />
-    <div v-if="gasData.length" class="gas">
+    <div v-show="gasData.length" class="dirver" style="margin-top: 10px;" />
+    <div v-show="gasData.length" class="gas">
       <div class="device-title">
         感知设备运行情况
       </div>
-      <div v-for="item in gasData" :key="item.name" class="gas-item">
+      <div v-for="item,index in gasData" :key="`${item.name}${item.devcode}${index}${item.manufacturerName}`" class="gas-item">
         <span class="devoce-code" style="width: 25%;display: inline-block;" @click="goDeviceDetail(item)">{{
           item.devcode }}</span>
         <el-tooltip class="box-item" effect="dark"
diff --git a/src/views/home/well/components/lifeCycleRecord.vue b/src/views/home/well/components/lifeCycleRecord.vue
index e45cf32..f4be5fb 100644
--- a/src/views/home/well/components/lifeCycleRecord.vue
+++ b/src/views/home/well/components/lifeCycleRecord.vue
@@ -119,7 +119,6 @@
         搜索
       </el-button>
       <el-button
-        v-if="proxy.hasPerm($route.path.includes('well') ? '/well/lifeCycle/export' : '/station/monitor/exportLifeCycle')"
         type="primary" @click="exportList"
       >
         导出
diff --git a/src/views/home/well/components/monitorDataGasList.vue b/src/views/home/well/components/monitorDataGasList.vue
index fb114fa..f2191c0 100644
--- a/src/views/home/well/components/monitorDataGasList.vue
+++ b/src/views/home/well/components/monitorDataGasList.vue
@@ -79,7 +79,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/components/monitorDataList.vue b/src/views/home/well/components/monitorDataList.vue
index 81bddb4..a2dfe1b 100644
--- a/src/views/home/well/components/monitorDataList.vue
+++ b/src/views/home/well/components/monitorDataList.vue
@@ -165,7 +165,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 500)
+  })
 }
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/well/index.vue b/src/views/home/well/index.vue
index 0680ef1..5188b23 100644
--- a/src/views/home/well/index.vue
+++ b/src/views/home/well/index.vue
@@ -551,7 +551,7 @@
   </el-table-column> -->
           <el-table-column label="操作" align="center" width="80">
             <template #default="scope">
-              <el-button v-if="proxy.hasPerm('/well/detail')" type="primary" link size="small"
+              <el-button type="primary" link size="small"
                 @click="editRow('detail', scope.row)">
                 查看
               </el-button>
diff --git a/src/views/mobile/device/add.vue b/src/views/mobile/device/add.vue
index 94242db..d4cd9f9 100644
--- a/src/views/mobile/device/add.vue
+++ b/src/views/mobile/device/add.vue
@@ -870,7 +870,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 onBeforeUnmount(() => {
   window.addEventListener('resize', () => { })
diff --git a/src/views/mobile/device/success.vue b/src/views/mobile/device/success.vue
index becc185..4daf888 100644
--- a/src/views/mobile/device/success.vue
+++ b/src/views/mobile/device/success.vue
@@ -35,7 +35,7 @@
   setTimeout(() => {
     const resize = new Event('resize')
     window.dispatchEvent(resize)
-  }, 200)
+  })
 }
 const showMap = ref(false)
 onMounted(() => {
diff --git a/src/views/system/role/listRole.vue b/src/views/system/role/listRole.vue
index 40c4605..4d7b76f 100644
--- a/src/views/system/role/listRole.vue
+++ b/src/views/system/role/listRole.vue
@@ -8,7 +8,7 @@
 import FunctionPerm from './functionPerm.vue'
 import DataPerm from './dataPerm.vue'
 import { delRole, getDataScopeTypeList, getRoleList } from '@/api/system/role'
-import { toTreeList } from '@/utils/structure'
+import { toTreeList, findPid } from '@/utils/structure'
 const { proxy } = getCurrentInstance() as any
 
 const editDialog = ref() // 组件
@@ -42,6 +42,7 @@
 ])
 // 数据列表
 const list: Ref<RoleInfo[]> = ref([])
+const allList = ref<any[]>([])
 const loading = ref(false)
 
 // 搜索按钮
@@ -52,12 +53,24 @@
 function fetchData() {
   loading.value = true
   getRoleList(listQuery).then((res) => {
-    const data = res.data.map((item: RoleInfo): RoleInfo => {
+    let response = res.data
+    allList.value = res.data
+    if (findPid(res.data).length > 1) {
+      const pids = findPid(res.data).filter((item: string) => item !=='0')
+      response.forEach((element:RoleInfo )=> {
+        if(pids.includes(element.pid)) {
+          element.pid = '0'
+        }
+      })
+    }
+
+    const data = response.map((item: RoleInfo): RoleInfo => {
       return {
         ...item,
         dataScopeTypeName: dataScopeTypeDict[parseInt(item.dataScopeType)],
       }
     })
+
     const treeData = toTreeList<RoleInfo>(data)
     list.value = treeData
     loading.value = false
@@ -77,8 +90,11 @@
 }
 // 删除角色
 function del(row: RoleInfo) {
+  // console.log(row, 'row')
+  // 查询当前数据是否含有子数据
+ const hasChildren = allList.value.filter((item: any) => item.pid ===row.id).length
   ElMessageBox.confirm(
-    `确定要删除${row.name}吗？`,
+    hasChildren ? `确定要删除${row.name}吗，当前角色含有子角色` :  `确定要删除${row.name}吗？`,
     '确认删除',
     {
       confirmButtonText: '确定',
@@ -135,7 +151,7 @@
   <app-container>
     <search-area @search="search">
       <search-item>
-        <el-input v-model="listQuery.keyword" placeholder="角色名称" style="width: 162px;" />
+        <el-input v-model.trim="listQuery.keyword" placeholder="角色名称" clearable style="width: 162px;" />
       </search-item>
     </search-area>
     <table-container>
@@ -143,23 +159,29 @@
         <icon-button v-if="proxy.hasPerm('/sys/role/add')" icon="icon-add" title="新增" @click="add" />
         <icon-button icon="icon-fold" title="展开/折叠" @click="expandOrCollapse" />
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" border stripe style="width: 100%;"
+        :tree-props="{ children: 'children' }">
+        <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value"
+          :width="column.width" :align="column.align" />
         <el-table-column
-          v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align"
-        />
-        <el-table-column v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')" label="操作" width="210" align="left" header-align="center">
+          v-if="proxy.hasPerm('/sys/role/funcAuthor') || proxy.hasPerm('/sys/role/dataAuthor') || proxy.hasPerm('/sys/role/update') || proxy.hasPerm('/sys/role/delete')"
+          label="操作" width="210" align="left" header-align="center">
           <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/update')" type="primary" link size="small"
+              class="table-text-button" @click="edit(scope.row)">
               修改
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/delete')" type="danger" link size="small"
+              class="table-text-button" @click="del(scope.row)">
               删除
             </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small" class="table-text-button" @click="openFunctionPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/funcAuthor')" type="primary" link size="small"
+              class="table-text-button" @click="openFunctionPerm(scope.row)">
               功能权限
             </el-button>
             <!-- 只有自定义显示配置数据权限按钮 -->
-            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary" link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
+            <el-button v-if="proxy.hasPerm('/sys/role/dataAuthor') && scope.row.dataScopeType === '4'" type="primary"
+              link size="small" class="table-text-button" @click="openDataPerm(scope.row)">
               数据权限
             </el-button>
           </template>
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index a4f9ee3..23f4a04 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -126,7 +126,7 @@
     addUserRef.value.initDialog('update', user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 重置密码
@@ -152,7 +152,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 批量加密
@@ -202,7 +202,7 @@
     }).catch(() => { })
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 冻结/解冻用户
@@ -239,7 +239,7 @@
     roleAssignmentRef.value.initDialog(user)
   }
   else {
-    ElMessage.error('必须选中一项')
+    ElMessage.error('必须选中用户')
   }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
diff --git a/src/views/system/user/roleAssignment.vue b/src/views/system/user/roleAssignment.vue
index f262b91..4e9c686 100644
--- a/src/views/system/user/roleAssignment.vue
+++ b/src/views/system/user/roleAssignment.vue
@@ -4,6 +4,7 @@
 import type { userType } from './user-interface'
 import { getShowItem, toTreeList } from '@/utils/structure'
 import { getRoleTreeListByUser } from '@/api/system/role'
+import { getRoles } from '@/api/system/user'
 import { roleAssign } from '@/api/system/user'
 const props = defineProps({
   titleText: {
@@ -15,6 +16,7 @@
 const dialogFormVisible = ref<boolean>(false)
 const loading = ref<boolean>(false) // 加载动态效果
 const roleTreeList = ref([])// 角色树列表数据
+const roleId = ref('')
 const defaultProps = ref({
   label: 'name',
   children: 'children',
@@ -31,35 +33,62 @@
 const treeRef = ref()
 // 获取角色列表
 const fetchRoleTree = () => {
-  getRoleTreeListByUser(userId.value).then((response) => {
-    // 过滤掉计量人员角色
-    response.data = response.data.filter((item: any) => item.name !== '计量人员')
+  getRoles().then(response => {
     if (response.data) {
       roleTreeList.value = toTreeList(response.data)
       // 获取展开项和选中项
       const expArr: string[] = []
-      const cheArr: string[] = []
+      let cheArr: string[] = []
       response.data.forEach((element: any) => {
-        if (element.open && element.checked) {
-          expArr.push(element.id)
-          cheArr.push(element.id)
-        }
-        else if (element.open) {
-          expArr.push(element.id)
-        }
-        else if (element.checked) {
-          cheArr.push(element.id)
-        }
+        expArr.push(element.id)
       })
+      if (roleId.value) {
+        const roles = roleId.value.split(',')
+        cheArr = roles
+      }
       defaultExpanded.value = expArr
       defaultChecked.value = cheArr
       treeRef.value?.setCheckedNodes(defaultChecked.value)
       loading.value = false
     }
+    else {
+      roleTreeList.value =  []
+      defaultExpanded.value = []
+      defaultChecked.value = []
+      loading.value = false
+    }
+
   })
+  // getRoleTreeListByUser(userId.value).then((response) => {
+  //   // 过滤掉计量人员角色
+  //   response.data = response.data.filter((item: any) => item.name !== '计量人员')
+  //   if (response.data) {
+  //     roleTreeList.value = toTreeList(response.data)
+  //     // 获取展开项和选中项
+  //     const expArr: string[] = []
+  //     const cheArr: string[] = []
+  //     response.data.forEach((element: any) => {
+  //       if (element.open && element.checked) {
+  //         expArr.push(element.id)
+  //         cheArr.push(element.id)
+  //       }
+  //       else if (element.open) {
+  //         expArr.push(element.id)
+  //       }
+  //       else if (element.checked) {
+  //         cheArr.push(element.id)
+  //       }
+  //     })
+  //     defaultExpanded.value = expArr
+  //     defaultChecked.value = cheArr
+  //     treeRef.value?.setCheckedNodes(defaultChecked.value)
+  //     loading.value = false
+  //   }
+  // })
 }
 // 弹窗初始化
 const initDialog = (row: userType) => {
+  roleId.value = row.roleId
   loading.value = true
   userId.value = row.id
   userName.value = row.name
@@ -70,6 +99,10 @@
 defineExpose({ initDialog })
 const saveData = () => {
   ids.value = treeRef.value.getCheckedKeys()
+  if(!ids.value.length) {
+    ElMessage.warning('请选择角色')
+    return
+  }
   roleAssign(userId.value, ids.value).then((response) => {
     if (response.code === 200) {
       ElMessage.success('角色分配成功')
@@ -85,20 +118,19 @@
   defaultExpanded.value = []
   defaultChecked.value = []
   treeRef.value?.setCheckedNodes([])
-  emits('resetData')
+  // emits('resetData')
 }
 </script>
 
 <template>
   <el-dialog v-model="dialogFormVisible" :title="titleText" width="30%" append-to-body>
-    <el-scrollbar>
-      <el-tree
-        ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
+    <el-scrollbar v-show="roleTreeList.length">
+      <el-tree ref="treeRef" v-loading="loading" :props="defaultProps" :data="roleTreeList"
         :default-expanded-keys="defaultExpanded" :default-checked-keys="defaultChecked"
         :default-expand-all="defaultExpandAll" show-checkbox check-strictly node-key="id"
-        @check-change="handleCheckChange"
-      />
+        @check-change="handleCheckChange" />
     </el-scrollbar>
+    <el-empty  v-show="!roleTreeList.length" description="暂无数据" :image-size="100"  />
     <div class="dialog-footer footer">
       <el-button type="primary" @click="saveData">
         保存
diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue
index 864236e..ce72ca1 100644
--- a/src/views/system/user/userAdd.vue
+++ b/src/views/system/user/userAdd.vue
@@ -4,13 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { addInfo } from './user-interface'
 import comTreeSelect from './selecTree.vue'
-import { toTreeList } from '@/utils/structure'
+import { toTreeList, findPid } from '@/utils/structure'
 import { addUser, updateUser } from '@/api/system/user'
 import { getRoleTreeList } from '@/api/system/role'
 import { getDeptTreeList } from '@/api/system/dept'
 import { getDictByCode } from '@/api/system/dict'
 import { RSAencrypt } from '@/utils/security'
-import { encrypt , decrypt } from '@/utils/security1'
+import { encrypt, decrypt } from '@/utils/security1'
 import { getManufacturerList } from '@/api/system/manufacturer'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>()
@@ -118,10 +118,22 @@
 // 加载角色树形下拉菜单
 const fetchRoleTree = () => {
   getRoleTreeList().then((res) => {
-    // 过滤掉计量人员角色
-    res.data.list = res.data.list.filter((item: any) => item.name !== '计量人员')
+    console.log(res.data, '角色列表')
+    let response = res.data.list
     if (res.data.list) { // 将列表转树结构
-      roleTreeList.value = toTreeList(res.data.list, '0', true)
+      // console.log(findPid(response))
+      if (findPid(res.data.list).length > 1) {
+        const pids = findPid(res.data.list).filter((item: string) => item !== '0' && item !== '')
+        response.forEach((element: any) => {
+          if (pids?.includes(element.pid)) {
+            element.pid = '0'
+          }
+        })
+      }
+      roleTreeList.value = toTreeList(response, '0', true)
+    }
+    else {
+      roleTreeList.value = []
     }
   })
 }
@@ -162,7 +174,7 @@
         name: encrypt(userForm1.name),
         email: encrypt(userForm1.email),
         phone: encrypt(userForm1.phone),
-        avatar: userForm.avatar && !userForm.avatar.includes('.') ? userForm.avatar.join(',') : ''
+        avatar: userForm.avatar && !userForm.avatar?.includes('.') ? userForm.avatar.join(',') : ''
       }).then((response) => {
         ElMessageBox.confirm('新增成功，是否继续新增?', '提示', {
           confirmButtonText: '是',
@@ -221,7 +233,7 @@
   dialogFormVisible.value = false
   // resetForm1()
   ruleFormRef.value?.resetFields()
-  emits('resetData')
+  // emits('resetData')
 }
 // 初始化对话框
 const initDialog = (dialogStatusflag: string, row: addInfo = {
@@ -245,7 +257,7 @@
   getDictByCode('bizStaffType').then((response) => {
     perTypeList.value = response.data
   })
-  getManufacturerList({ offset: 1, limit: 9999}).then(res => {
+  getManufacturerList({ offset: 1, limit: 9999 }).then(res => {
     manufacturerList.value = res.data.rows.map((item: any) => ({
       id: item.id,
       name: item.name,
@@ -292,14 +304,14 @@
     userForm.avatar = row.avatar
     delete userForm.password
     delete userForm.rePassword
-    if(String(row.version) !== '1' && String(row.version) !== '0') {
+    if (String(row.version) !== '1' && String(row.version) !== '0') {
       row.version = ''
       userForm.version = ''
     }
     else {
       userForm.version = String(row.version)
     }
-    if(row.avatar?.includes('.')) {
+    if (row.avatar?.includes('.')) {
       row.avatar = ''
       userForm.avatar = ''
     }
@@ -312,15 +324,14 @@
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="50%" :title="textMap[dialogStatus]" append-to-body>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" width="50%" :title="textMap[dialogStatus]"
+    append-to-body>
     <el-form ref="ruleFormRef" :rules="rules" :model="userForm" label-position="right" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="账号" prop="account">
-            <el-input
-              v-model.trim="userForm.account" :disabled="dialogStatus === 'update'" type="text"
-              placeholder="必填"
-            />
+            <el-input v-model.trim="userForm.account" :disabled="dialogStatus === 'update'" type="text"
+              placeholder="必填" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -339,10 +350,8 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="出生日期" prop="birthday">
-            <el-date-picker
-              v-model="userForm.birthday" type="date" format="YYYY-MM-DD" placeholder="选择日期"
-              style="width: 100%;"
-            />
+            <el-date-picker v-model="userForm.birthday" type="date" format="YYYY-MM-DD" placeholder="选择日期"
+              style="width: 100%;" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -361,10 +370,8 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="dialogStatus === 'create'" label="角色" prop="roleid">
-            <com-tree-select
-              v-model="userForm.roleid" :options="roleTreeList" placeholder="选择角色"
-              :tree-props="roleProps" style="width: 100%;"
-            />
+            <com-tree-select v-model="userForm.roleid" :options="roleTreeList" placeholder="选择角色"
+              :tree-props="roleProps" style="width: 100%;" />
           </el-form-item>
           <el-form-item v-else label="角色">
             <el-input v-model="roleName" :disabled="dialogStatus === 'update'" type="text" placeholder="无" />
@@ -403,7 +410,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="userForm.version == '1'" :span="12" >
+        <el-col v-if="userForm.version == '1'" :span="12">
           <el-form-item label="厂商" prop="avatar">
             <el-select v-model="userForm.avatar" placeholder="请选择" :style="{ width: '100%' }" multiple>
               <el-option v-for="item in manufacturerList" :key="item.id" :label="item.name" :value="item.value" />