diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index dc0f53c..7527f72 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -7,7 +7,7 @@
 import { ElMessage } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
@@ -250,7 +250,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index dc0f53c..7527f72 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -7,7 +7,7 @@
 import { ElMessage } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
@@ -250,7 +250,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 02ff9a3..bc9ae81 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -99,7 +100,7 @@
 
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index dc0f53c..7527f72 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -7,7 +7,7 @@
 import { ElMessage } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
@@ -250,7 +250,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 02ff9a3..bc9ae81 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -99,7 +100,7 @@
 
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 76ce423..4a5816a 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -9,6 +9,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -163,7 +164,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index dc0f53c..7527f72 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -7,7 +7,7 @@
 import { ElMessage } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
@@ -250,7 +250,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 02ff9a3..bc9ae81 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -99,7 +100,7 @@
 
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 76ce423..4a5816a 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -9,6 +9,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -163,7 +164,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 3ca678d..0a2feb3 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -5,8 +5,9 @@
  -->
 <script lang="ts" setup name="DeviceTrajectorySearch">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { getDeviceTypeListPage } from '@/api/home/device/type'
-const deviceTypeList = ref<any[]>([]) // 设备类型列表
+import { getDeviceTypeListPage } from '@/api/home/device/type' // 设备类型列表
+import { shortcuts } from '@/utils/common'
+const deviceTypeList = ref<any[]>([])
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -115,7 +116,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index dc0f53c..7527f72 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -7,7 +7,7 @@
 import { ElMessage } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
@@ -250,7 +250,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 02ff9a3..bc9ae81 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -99,7 +100,7 @@
 
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 76ce423..4a5816a 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -9,6 +9,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -163,7 +164,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 3ca678d..0a2feb3 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -5,8 +5,9 @@
  -->
 <script lang="ts" setup name="DeviceTrajectorySearch">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { getDeviceTypeListPage } from '@/api/home/device/type'
-const deviceTypeList = ref<any[]>([]) // 设备类型列表
+import { getDeviceTypeListPage } from '@/api/home/device/type' // 设备类型列表
+import { shortcuts } from '@/utils/common'
+const deviceTypeList = ref<any[]>([])
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -115,7 +116,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 50ed2ab..4cb86b5 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -7,6 +7,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -145,7 +146,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index dc0f53c..7527f72 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -7,7 +7,7 @@
 import { ElMessage } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
@@ -250,7 +250,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 02ff9a3..bc9ae81 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -99,7 +100,7 @@
 
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 76ce423..4a5816a 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -9,6 +9,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -163,7 +164,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 3ca678d..0a2feb3 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -5,8 +5,9 @@
  -->
 <script lang="ts" setup name="DeviceTrajectorySearch">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { getDeviceTypeListPage } from '@/api/home/device/type'
-const deviceTypeList = ref<any[]>([]) // 设备类型列表
+import { getDeviceTypeListPage } from '@/api/home/device/type' // 设备类型列表
+import { shortcuts } from '@/utils/common'
+const deviceTypeList = ref<any[]>([])
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -115,7 +116,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 50ed2ab..4cb86b5 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -7,6 +7,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -145,7 +146,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />
diff --git a/src/views/system/manufacturer/editDialog.vue b/src/views/system/manufacturer/editDialog.vue
new file mode 100644
index 0000000..2dc6793
--- /dev/null
+++ b/src/views/system/manufacturer/editDialog.vue
@@ -0,0 +1,161 @@
+<!--
+  Description: 厂商管理-编辑或新建
+  Author: 李亚光
+  Date: 2023-09-13
+ -->
+<script lang="ts" setup name="EditManufacturer">
+import type { FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { addManufacturer, editManufacturer } from '@/api/system/manufacturer'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  contact: '',
+  createTime: '',
+  name: '',
+  id: '',
+  tel: '',
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+} // 表头显示标题
+const rules: FormRules = {
+  name: [{ required: true, message: '厂商名称不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    contact: '',
+    createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    name: '',
+    id: '',
+    tel: '',
+  }
+}
+
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'edit') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = JSON.parse(JSON.stringify(row))
+  }
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      addManufacturer(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          resetForm()
+          nextTick(() => {
+            dataFormRef.value.clearValidate()
+          })
+          ElMessage.success('新增成功')
+          dialogFormVisible.value = false
+          // 通知父组件刷新状态
+          emits('refresh')
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      editManufacturer(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('refresh')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="厂商名称" prop="name">
+            <el-input v-model.trim="dataForm.name" type="text" placeholder="厂商名称" style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人" prop="contact">
+            <el-input v-model.trim="dataForm.contact" type="text" placeholder="联系人" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="联系方式" prop="tel">
+            <el-input v-model.trim="dataForm.tel" type="text" placeholder="联系方式" style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="创建时间" prop="createTime">
+            <el-input v-model.trim="dataForm.createTime" type="text" placeholder="创建时间" style="width: 100%;" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/api/system/manufacturer.ts b/src/api/system/manufacturer.ts
new file mode 100644
index 0000000..40a15eb
--- /dev/null
+++ b/src/api/system/manufacturer.ts
@@ -0,0 +1,39 @@
+/*
+ * 厂商管理接口
+*/
+import request from '../index'
+// 列表
+export function getManufacturerList(data: any) {
+  return request({
+    url: `/system/busManufacturer/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 删除
+export function removeManufacturer(id: any) {
+  return request({
+    url: '/system/busManufacturer/batchDelete',
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+// 新建
+export function addManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/add',
+    method: 'post',
+    data,
+  })
+}
+// 编辑
+export function editManufacturer(data: any) {
+  return request({
+    url: '/system/busManufacturer/edit',
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/assets/images/dashboard/bjtj.png b/src/assets/images/dashboard/bjtj.png
index f14ab85..891a75b 100644
--- a/src/assets/images/dashboard/bjtj.png
+++ b/src/assets/images/dashboard/bjtj.png
Binary files differ
diff --git a/src/assets/images/dashboard/czjc.png b/src/assets/images/dashboard/czjc.png
index 62d6842..79e55a5 100644
--- a/src/assets/images/dashboard/czjc.png
+++ b/src/assets/images/dashboard/czjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/dqbj.png b/src/assets/images/dashboard/dqbj.png
index 2848938..7b58b15 100644
--- a/src/assets/images/dashboard/dqbj.png
+++ b/src/assets/images/dashboard/dqbj.png
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.jpg b/src/assets/images/dashboard/guanxian.jpg
deleted file mode 100644
index 07a17f7..0000000
--- a/src/assets/images/dashboard/guanxian.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/guanxian.png b/src/assets/images/dashboard/guanxian.png
new file mode 100644
index 0000000..1df2cd3
--- /dev/null
+++ b/src/assets/images/dashboard/guanxian.png
Binary files differ
diff --git a/src/assets/images/dashboard/gxjc.png b/src/assets/images/dashboard/gxjc.png
index 64fbb0f..4878c49 100644
--- a/src/assets/images/dashboard/gxjc.png
+++ b/src/assets/images/dashboard/gxjc.png
Binary files differ
diff --git a/src/assets/images/dashboard/lixian.png b/src/assets/images/dashboard/lixian.png
index a5a1914..9b1f055 100644
--- a/src/assets/images/dashboard/lixian.png
+++ b/src/assets/images/dashboard/lixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/ssgl.png b/src/assets/images/dashboard/ssgl.png
index debf49b..22d2c5d 100644
--- a/src/assets/images/dashboard/ssgl.png
+++ b/src/assets/images/dashboard/ssgl.png
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.jpg b/src/assets/images/dashboard/tiaoya.jpg
deleted file mode 100644
index 7c67734..0000000
--- a/src/assets/images/dashboard/tiaoya.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/tiaoya.png b/src/assets/images/dashboard/tiaoya.png
new file mode 100644
index 0000000..f4ddb13
--- /dev/null
+++ b/src/assets/images/dashboard/tiaoya.png
Binary files differ
diff --git a/src/assets/images/dashboard/tingyong.png b/src/assets/images/dashboard/tingyong.png
index ca9e409..a9074b9 100644
--- a/src/assets/images/dashboard/tingyong.png
+++ b/src/assets/images/dashboard/tingyong.png
Binary files differ
diff --git a/src/assets/images/dashboard/well.jpg b/src/assets/images/dashboard/well.jpg
deleted file mode 100644
index 9776ec0..0000000
--- a/src/assets/images/dashboard/well.jpg
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/dashboard/well.png b/src/assets/images/dashboard/well.png
new file mode 100644
index 0000000..6d778d3
--- /dev/null
+++ b/src/assets/images/dashboard/well.png
Binary files differ
diff --git a/src/assets/images/dashboard/zaixian.png b/src/assets/images/dashboard/zaixian.png
index 2cfaeee..aa8d5e5 100644
--- a/src/assets/images/dashboard/zaixian.png
+++ b/src/assets/images/dashboard/zaixian.png
Binary files differ
diff --git a/src/assets/images/dashboard/zjjc.png b/src/assets/images/dashboard/zjjc.png
index eb3d146..51a8396 100644
--- a/src/assets/images/dashboard/zjjc.png
+++ b/src/assets/images/dashboard/zjjc.png
Binary files differ
diff --git a/src/assets/images/device/count/backup.png b/src/assets/images/device/count/backup.png
new file mode 100644
index 0000000..7cdc265
--- /dev/null
+++ b/src/assets/images/device/count/backup.png
Binary files differ
diff --git a/src/assets/images/device/count/upkeep.png b/src/assets/images/device/count/upkeep.png
new file mode 100644
index 0000000..d10adce
--- /dev/null
+++ b/src/assets/images/device/count/upkeep.png
Binary files differ
diff --git a/src/components/Echart/BarChartDouble.vue b/src/components/Echart/BarChartDouble.vue
index 8a54ec3..eccced5 100644
--- a/src/components/Echart/BarChartDouble.vue
+++ b/src/components/Echart/BarChartDouble.vue
@@ -284,7 +284,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/BarChartHorizontal.vue b/src/components/Echart/BarChartHorizontal.vue
index 475cdbf..487d330 100644
--- a/src/components/Echart/BarChartHorizontal.vue
+++ b/src/components/Echart/BarChartHorizontal.vue
@@ -253,7 +253,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     xAxis: [
diff --git a/src/components/Echart/BarChartVertical.vue b/src/components/Echart/BarChartVertical.vue
index 02f9f14..7701800 100644
--- a/src/components/Echart/BarChartVertical.vue
+++ b/src/components/Echart/BarChartVertical.vue
@@ -260,7 +260,7 @@
         },
       },
       valueFormatter: (value: string | number) => {
-        return value ? value + props.unit : ''
+        return value ? value + props.unit : value === 0 ? '0' : ''
       },
     }, // 提示框
     yAxis: [
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index b811f29..cd9a0ce 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -294,6 +294,7 @@
           width: 2,
         },
         data: item.data,
+        markLine: item.markLine,
       }
       // 线段颜色
       if (item.color || props.colors.length > 0) {
diff --git a/src/components/Echart/PieChart.vue b/src/components/Echart/PieChart.vue
index ca56b83..e203f26 100644
--- a/src/components/Echart/PieChart.vue
+++ b/src/components/Echart/PieChart.vue
@@ -21,6 +21,14 @@
     default: false,
   },
   /**
+   * 展示每项标题文字lebel
+   */
+  showEmphasis: {
+    type: Boolean,
+    default: true,
+  },
+
+  /**
    * 标题
    */
   title: {
@@ -227,7 +235,7 @@
           },
         },
         emphasis: {
-          show: true,
+          show: props.showEmphasis,
           textStyle: {
             fontSize: 22,
             fontWeight: 'bold',
diff --git a/src/components/Echart/echart-interface.ts b/src/components/Echart/echart-interface.ts
index fd7cb73..2318df7 100644
--- a/src/components/Echart/echart-interface.ts
+++ b/src/components/Echart/echart-interface.ts
@@ -4,6 +4,8 @@
   name: string // 轴线名称
   data: string[] | number[] // 数值
   color?: string // 颜色
+  markLine?: any
+  symbol?: string
 }
 
 // 饼图数据格式
@@ -181,6 +183,10 @@
     color?: string | LinearGradientObject // 填充颜色
   }
   data: number[] | string[]
+  markLine?: {
+    data?: any
+    label?: any
+  }
 }
 // 饼图series配置项
 export interface pieSeriesOption {
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index bae4cfb..e40d780 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -76,6 +76,18 @@
         },
       },
       {
+        path: 'manufacturer',
+        name: 'manufacturerList',
+        component: () => import('@/views/system/manufacturer/index.vue'),
+        meta: {
+          title: '厂商管理',
+          auth: '/sys/manufacturer',
+          sidebar: true,
+          breadcrumb: true,
+          activeMenu: '/system/manufacturer',
+        },
+      },
+      {
         path: 'dict',
         name: 'DictList',
         component: () => import('@/views/system/dict/listDict.vue'),
diff --git a/src/utils/common.ts b/src/utils/common.ts
new file mode 100644
index 0000000..64f62db
--- /dev/null
+++ b/src/utils/common.ts
@@ -0,0 +1,30 @@
+// 时间范围选择 快捷时间段
+export const shortcuts = [
+  {
+    text: '近一周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setDate(start.getDate() - 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '近一个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 1)
+      return [start, end]
+    },
+  },
+  {
+    text: '近三个月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setMonth(start.getMonth() - 3)
+      return [start, end]
+    },
+  },
+]
diff --git a/src/views/home/alarm/count/components/alarmStatistics.vue b/src/views/home/alarm/count/components/alarmStatistics.vue
index 7aa930f..f91ba17 100644
--- a/src/views/home/alarm/count/components/alarmStatistics.vue
+++ b/src/views/home/alarm/count/components/alarmStatistics.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmType } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -50,35 +51,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // setTimeout(() => {
 //   xAxisData.value = [
 //     '闸井浓度超限', '场站浓度超限', '场站火焰报警', '疑似第三方破坏', '场站烟雾报警',
@@ -161,7 +133,7 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :show-label="false"
             :colors="[]" :bar-width="15"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
diff --git a/src/views/home/alarm/count/components/deptCount.vue b/src/views/home/alarm/count/components/deptCount.vue
index 798bfd2..8282f39 100644
--- a/src/views/home/alarm/count/components/deptCount.vue
+++ b/src/views/home/alarm/count/components/deptCount.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="AlarmCount">
 import layout from './layout.vue'
 import { getAlarmCompany } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -27,35 +28,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 类别
 const ledgerTypeList = ref<{ id: string; name: string; value: string }[]>([
   {
@@ -74,8 +46,22 @@
     value: '3',
   },
 ])
+const columns = ref<any[]>([
+  {
+    text: '闸井浓度超限',
+    value: 'well',
+  },
+  {
+    text: '场站浓度超限',
+    value: 'station',
+  },
+  {
+    text: '管线浓度超限',
+    value: 'pipeline',
+  },
+])
 const xAxisData = ref([])
-const data = ref([])
+const data = ref<any[]>([])
 const list = ref([])
 const loading = ref(true)
 // setTimeout(() => {
@@ -110,9 +96,65 @@
   }, 500)
 }
 const fetchData = () => {
+  const columnsDict = {
+    闸井浓度超限: 'well',
+    场站浓度超限: 'station',
+    管线浓度超限: 'pipeline',
+  } as { [key: string]: string }
   loading.value = true
   getAlarmCompany(listQuery.value).then((res) => {
     console.log(res.data, '各单位报警统计')
+    xAxisData.value = res.data.map((item: any) => item.dept)
+    if (!listQuery.value.ledgerType) {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '1') {
+      data.value = [
+        {
+          name: '闸井浓度超限',
+          data: res.data.map((item: any) => item['闸井浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '2') {
+      data.value = [
+        {
+          name: '场站浓度超限',
+          data: res.data.map((item: any) => item['场站浓度超限']),
+        },
+      ]
+    }
+    else if (listQuery.value.ledgerType === '3') {
+      data.value = [
+        {
+          name: '管线浓度超限',
+          data: res.data.map((item: any) => item['管线浓度超限']),
+        },
+      ]
+    }
+    list.value = res.data.map((item: any) => ({
+      dept: item.dept,
+      well: item['闸井浓度超限'],
+      station: item['场站浓度超限'],
+      pipeline: item['管线浓度超限'],
+    }))
+    columns.value = data.value.map((item: any) => ({
+      text: item.name,
+      value: columnsDict[item.name],
+    }))
     resizePage()
     loading.value = false
   }).catch(() => {
@@ -130,22 +172,19 @@
     <template #search>
       <div class="search">
         <el-button
-          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '1' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('1')"
         >
           今日
         </el-button>
         <el-button
-          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '2' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('2')"
         >
           本周
         </el-button>
         <el-button
-          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small"
-          style="margin: 0 5px;"
+          :class="listQuery.timeType === '3' ? 'active' : ''" round size="small" style="margin: 0 5px;"
           @click="selectTimeType('3')"
         >
           本月
@@ -167,8 +206,8 @@
       <div v-loading="loading" class="alarm-count">
         <div class="bar">
           <bar-chart-vertical
-            v-show="xAxisData.length"
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            v-show="xAxisData.length" :x-axis-data="xAxisData" :bar-coner="0" :data="data"
+            :colors="[]" :bar-width="15" :show-label="false"
             :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
             :grid="{
               top: 50,
@@ -183,9 +222,10 @@
         <div class="table">
           <el-table border :data="list" stripe style="width: 100%;" :height="440">
             <el-table-column label="管理单位" prop="dept" align="center" width="200" />
-            <el-table-column label="闸井浓度超限" prop="wellOver" align="center" />
-            <el-table-column label="场站浓度超限" prop="senceOver" align="center" />
-            <el-table-column label="疑似第三方破坏" prop="thirdParty" align="center" />
+            <el-table-column
+              v-for="item in columns" :key="item.text" :label="item.text" :prop="item.value"
+              align="center"
+            />
           </el-table>
         </div>
       </div>
diff --git a/src/views/home/alarm/count/components/layout.vue b/src/views/home/alarm/count/components/layout.vue
index 90399a1..f507216 100644
--- a/src/views/home/alarm/count/components/layout.vue
+++ b/src/views/home/alarm/count/components/layout.vue
@@ -29,7 +29,8 @@
 .layout {
   // border: 2px solid #888;
   border-left: 4px solid #09f;
-  padding: 8px 6px;
+  padding: 3px 6px;
+  margin: 4px 0;
 
   .header {
     display: flex;
@@ -46,5 +47,8 @@
 .container {
   background-color: #fff !important;
   border-radius: 5px !important;
+  box-shadow: 0 0 12px rgb(0 0 0 / 12%);
+  border: 1px solid #e4e7ed;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/home/alarm/count/components/locationAnalysis.vue b/src/views/home/alarm/count/components/locationAnalysis.vue
index 4cd5921..fc75b9e 100644
--- a/src/views/home/alarm/count/components/locationAnalysis.vue
+++ b/src/views/home/alarm/count/components/locationAnalysis.vue
@@ -7,6 +7,7 @@
 import dayjs from 'dayjs'
 import layout from './layout.vue'
 import { getErrorAnalyse } from '@/api/home/dashboard/index'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   begTime: '',
   endTime: '',
@@ -29,35 +30,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
@@ -108,7 +80,7 @@
     <template #content>
       <div class="alarm-count">
         <div class="table">
-          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="340">
+          <el-table v-loading="loadingTable" border :data="list" stripe style="width: 100%;" :height="310">
             <el-table-column label="位置类型" prop="type" align="center" width="140" />
             <el-table-column label="位号" prop="tagNumber" align="center" width="160" />
             <el-table-column label="名称" prop="ledgerName" align="center" />
diff --git a/src/views/home/alarm/count/components/trendAnalysis.vue b/src/views/home/alarm/count/components/trendAnalysis.vue
index 18cfb4c..bf5593b 100644
--- a/src/views/home/alarm/count/components/trendAnalysis.vue
+++ b/src/views/home/alarm/count/components/trendAnalysis.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="TrendAnalysis">
 import layout from './layout.vue'
 import { getAlarmTrend } from '@/api/home/alarm/count'
+import { shortcuts } from '@/utils/common'
 const listQuery = ref({
   timeType: '2',
   ledgerType: '',
@@ -25,35 +26,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 const selectTimeType = (type: string) => {
   listQuery.value.timeType = type
 }
diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue
index 8b36a01..3676f4e 100644
--- a/src/views/home/alarm/current/index.vue
+++ b/src/views/home/alarm/current/index.vue
@@ -12,6 +12,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -66,35 +67,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/alarm/history/index.vue b/src/views/home/alarm/history/index.vue
index 74ca152..fee7e7f 100644
--- a/src/views/home/alarm/history/index.vue
+++ b/src/views/home/alarm/history/index.vue
@@ -10,6 +10,7 @@
 import { getAlarmLevelListPage, getAlarmTypeListPage } from '@/api/home/rule/alarm'
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { uniqueMultiArray } from '@/utils/Array'
+import { shortcuts } from '@/utils/common'
 const alarmCategoryList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类别
 const alarmTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 报警类型
 const alarmLevelList = ref<{ id: string; name: string; value: string }[]>([]) // 报警等级
@@ -80,35 +81,6 @@
     }
   }
 })
-const shortcuts = [
-  {
-    text: '近一周',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setDate(start.getDate() - 7)
-      return [start, end]
-    },
-  },
-  {
-    text: '近一个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 1)
-      return [start, end]
-    },
-  },
-  {
-    text: '近三个月',
-    value: () => {
-      const end = new Date()
-      const start = new Date()
-      start.setMonth(start.getMonth() - 3)
-      return [start, end]
-    },
-  },
-]
 // 查询数据
 const fetchData = () => {
   loadingTable.value = true
diff --git a/src/views/home/dashboard/components/imgData.ts b/src/views/home/dashboard/components/imgData.ts
index ac7db9f..b1c77e4 100644
--- a/src/views/home/dashboard/components/imgData.ts
+++ b/src/views/home/dashboard/components/imgData.ts
@@ -2,13 +2,14 @@
   bjtj: new URL('@/assets/images/dashboard/bjtj.png', import.meta.url),
   czjc: new URL('@/assets/images/dashboard/czjc.png', import.meta.url),
   dqbj: new URL('@/assets/images/dashboard/dqbj.png', import.meta.url),
-  guanxian: new URL('@/assets/images/dashboard/guanxian.jpg', import.meta.url),
+  guanxian: new URL('@/assets/images/dashboard/guanxian.png', import.meta.url),
   gxjc: new URL('@/assets/images/dashboard/gxjc.png', import.meta.url),
   lixian: new URL('@/assets/images/dashboard/lixian.png', import.meta.url),
   ssgl: new URL('@/assets/images/dashboard/ssgl.png', import.meta.url),
-  tiaoya: new URL('@/assets/images/dashboard/tiaoya.jpg', import.meta.url),
+
+  tiaoya: new URL('@/assets/images/dashboard/tiaoya.png', import.meta.url),
   tingyong: new URL('@/assets/images/dashboard/tingyong.png', import.meta.url),
-  well: new URL('@/assets/images/dashboard/well.jpg', import.meta.url),
+  well: new URL('@/assets/images/dashboard/well.png', import.meta.url),
   zaixian: new URL('@/assets/images/dashboard/zaixian.png', import.meta.url),
   zjjc: new URL('@/assets/images/dashboard/zjjc.png', import.meta.url),
 }
diff --git a/src/views/home/dashboard/index.vue b/src/views/home/dashboard/index.vue
index 3d371ae..e866787 100644
--- a/src/views/home/dashboard/index.vue
+++ b/src/views/home/dashboard/index.vue
@@ -8,6 +8,7 @@
 import { img } from './components/imgData'
 import { getBase, getDeviceStatus, getMessage } from '@/api/home/dashboard/index'
 import locationAnalysis from '@/views/home/alarm/count/components/locationAnalysis.vue'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 基本概况数据
 const basicProfileLoading = ref(true)
 const basicProfileData = ref<any[]>([
@@ -63,38 +64,38 @@
   {
     name: '当前报警',
     img: img.dqbj,
-    url: '',
-    auth: '',
+    url: 'AlarmCurrent',
+    auth: '/alarm/current',
   },
   {
     name: '闸井监测',
     img: img.zjjc,
-    url: '',
-    auth: '',
+    url: 'WellMonitor',
+    auth: '/well',
   },
   {
     name: '场站监测',
     img: img.czjc,
-    url: '',
-    auth: '',
+    url: 'StationMonitor',
+    auth: '/station/monitor',
   },
   {
     name: '管线监测',
     img: img.gxjc,
-    url: '',
-    auth: '',
+    url: 'PipelineMonitor',
+    auth: '/pipeline',
   },
   {
     name: '设备管理',
     img: img.ssgl,
-    url: '',
-    auth: '',
+    url: 'DeviceManage',
+    auth: '/device/manage',
   },
   {
     name: '报警统计',
     img: img.bjtj,
-    url: '',
-    auth: '',
+    url: 'AlarmCount',
+    auth: '/alarm/count',
   },
 ])
 // 消息通知数据
@@ -104,7 +105,15 @@
 const more = (type: string) => {
 
 }
-
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+const routeToPage = (item: any) => {
+  if (proxy.hasPerm(item.auth)) {
+    $router.push({
+      name: item.url,
+    })
+  }
+}
 // 获取数据
 const fetchData = () => {
   // 基本概况
@@ -152,9 +161,9 @@
     <div class="top-container">
       <div class="top-left-container">
         <!-- 基本概况 -->
-        <card v-loading="basicProfileLoading" class="base" title="基本概况" :show-more="false">
+        <layout class="base" title="基本概况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="basicProfileLoading" class="base-container">
               <div v-for="item in basicProfileData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -171,11 +180,11 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
         <!-- 设备运行情况 -->
-        <card v-loading="deviceOperationLoading" class="base" title="设备运行情况" :show-more="false">
+        <layout class="base" title="设备运行情况">
           <template #content>
-            <div class="base-container">
+            <div v-loading="deviceOperationLoading" class="base-container">
               <div v-for="item in deviceOperationData" :key="item" class="base-item">
                 <div class="img">
                   <img :src="item.img">
@@ -192,18 +201,21 @@
               </div>
             </div>
           </template>
-        </card>
+        </layout>
       </div>
     </div>
     <!-- 中部 -->
     <div class="middle-container top">
       <!-- 工作台 -->
-      <card class="bench" title="工作台" :show-more="false">
+      <layout class="bench" title="工作台">
         <template #content>
           <div class="bench-container">
-            <div v-for="item in benchData" :key="item" class="bench-item">
+            <div
+              v-for="item in benchData" v-show="proxy.hasPerm(item.auth)" :key="item" class="bench-item"
+              @click="routeToPage(item)"
+            >
               <div class="img">
-                <img :src="item.img">
+                <img style="width: 35px;height: px;" :src="item.img">
               </div>
               <div class="value">
                 {{ item.name }}
@@ -211,9 +223,17 @@
             </div>
           </div>
         </template>
-      </card>
+      </layout>
       <!-- 消息通知 -->
-      <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+      <layout class="message" title="消息通知">
+        <template #search>
+          <div class="search">
+            <div />
+            <div class="more">
+              >>更多
+            </div>
+          </div>
+        </template>
         <template #content>
           <el-scrollbar height="200px">
             <div v-loading="messageLoading" class="message-container">
@@ -227,7 +247,10 @@
             </div>
           </el-scrollbar>
         </template>
-      </card>
+      </layout>
+      <!-- <card class="message" title="消息通知" :show-more="true" @more="more('message')">
+
+      </card> -->
     </div>
     <!-- 底部 -->
     <div class="bottom-container top">
@@ -257,11 +280,15 @@
         justify-content: space-around;
 
         .base-item {
-          width: 30%;
+          width: 25%;
           display: flex;
 
           .img {
             width: 30%;
+
+            img {
+              width: 80%;
+            }
           }
 
           .content {
@@ -303,9 +330,15 @@
         }
 
         .img {
-          display: flex;
-          justify-content: center;
-          flex-direction: column;
+          width: 50%;
+
+          // display: flex;
+          // justify-content: center;
+          // flex-direction: column;
+          img {
+            width: 35px;
+            height: 35px;
+          }
         }
 
         .value {
@@ -421,6 +454,19 @@
     width: 77%;
     height: 250px;
 
+    .search {
+      padding: 0 15px;
+      display: flex;
+      justify-content: space-between;
+      color: #3d7eff;
+      font-size: 14px;
+
+      &:hover {
+        text-decoration: underline;
+        cursor: pointer;
+      }
+    }
+
     .message-container {
       .message-item {
         height: 33px;
diff --git a/src/views/home/device/count/components/bottom.vue b/src/views/home/device/count/components/bottom.vue
index abdf488..28a4d78 100644
--- a/src/views/home/device/count/components/bottom.vue
+++ b/src/views/home/device/count/components/bottom.vue
@@ -7,33 +7,38 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { getDeptDevice, getOfflineDevice } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 管理单位设备统计
 const deptLoading = ref(true)
 const xAxisData = ref([])
 const data = ref<any[]>([])
-setTimeout(() => {
-  xAxisData.value = [
-    '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
-  ]
-  data.value = [
-    {
-      name: '燃气智能终端',
-      data: [1, 8, 5, 8, 4],
-    },
-    {
-      name: '管盯',
-      data: [2, 4, 1, 8, 1],
-    },
-  ]
-}, 1000)
+// setTimeout(() => {
+//   xAxisData.value = [
+//     '第一分公司', '第二分公司', '第三分公司', '第四分公司', '第五分公司',
+//   ]
+//   data.value = [
+//     {
+//       name: '燃气智能终端',
+//       data: [1, 8, 5, 8, 4],
+//     },
+//     {
+//       name: '管盯',
+//       data: [2, 4, 1, 8, 1],
+//     },
+//   ]
+// }, 1000)
 // 获取数据
 const fetchData = () => {
   deptLoading.value = true
   getDeptDevice().then((res) => {
+    xAxisData.value = res.data.filter((item: any) => Number(item.value)).map((item: any) => item.name)
+    data.value = [
+      {
+        name: '设备数量',
+        data: res.data.filter((item: any) => Number(item.value)).map((item: any) => item.value),
+      },
+    ]
     deptLoading.value = false
-    //   xAxisData.value = res.data.map((item: any) => item.name)
-    //   data
-    //  console.log(res.data, '222222222222222')
   }).catch(() => {
     deptLoading.value = false
   })
@@ -48,9 +53,9 @@
   { text: '设备编号', value: 'devcode', align: 'center' },
   { text: '设备类型', value: 'devTypeName', align: 'center' },
   { text: '安装位号', value: 'tagNumber', align: 'center' },
-  { text: '最新记录上传时间', value: 'lastTime', align: 'center' },
-  { text: '离线天数', value: 'offDays', align: 'center', width: '90' },
-  { text: '离线原因预测', value: 'reasons', align: 'center', width: '100' },
+  { text: '最新记录上传时间', value: 'lastTime', align: 'center', width: '185' },
+  { text: '离线天数', value: 'offDays', align: 'center', width: '85' },
+  { text: '离线原因预测', value: 'reasons', align: 'center', width: '120' },
 ])
 const listQuery = ref({
   devcode: '',
@@ -110,71 +115,70 @@
 <template>
   <div class="header-container">
     <!-- 管理单位设备统计 -->
-    <div class="header-left">
-      <div class="title">
-        管理单位设备统计
-      </div>
-      <div v-loading="deptLoading" class="content">
-        <bar-chart-vertical
-          :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-          :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-        />
-      </div>
-    </div>
+    <layout class="header-left" title="管理单位设备统计">
+      <template #content>
+        <div v-loading="deptLoading" class="content">
+          <bar-chart-vertical
+            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
+            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+          />
+        </div>
+      </template>
+    </layout>
     <!-- 离线设备清单 -->
-    <div class="header-right">
-      <div class="title">
-        离线设备清单
-      </div>
-      <div class="content">
-        <search-area :need-clear="true" @search="fetchListData" @clear="reset">
-          <search-item>
-            <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
-              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
-              <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
-            </el-select>
-          </search-item>
-        </search-area>
-        <table-container>
-          <template #btns-right>
-            <!-- 操作 -->
-            <div>
-              <el-button type="primary">
-                导出
-              </el-button>
-            </div>
-          </template>
-          <normal-table
-            :data="list" :total="total" :columns="columns" :height="200" :query="listQuery" :list-loading="loadingTable"
-            @change="changePage"
-          >
-            <template #preColumns>
-              <el-table-column label="序号" width="55" align="center">
-                <template #default="scope">
-                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                </template>
-              </el-table-column>
+    <layout class="header-right" title="离线设备清单">
+      <template #content>
+        <div class="content">
+          <search-area :need-clear="true" @search="fetchListData" @clear="reset">
+            <search-item>
+              <el-input v-model.trim="listQuery.devcode" placeholder="设备编号" clearable />
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.devTypeId" placeholder="设备类型" clearable class="select">
+                <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+            <search-item>
+              <el-select v-model="listQuery.reasons" placeholder="离线原因" clearable class="select">
+                <el-option v-for="item in reasonsList" :key="item.id" :label="item.name" :value="item.value" />
+              </el-select>
+            </search-item>
+          </search-area>
+          <table-container>
+            <template #btns-right>
+              <!-- 操作 -->
+              <div>
+                <el-button type="primary">
+                  导出
+                </el-button>
+              </div>
             </template>
-          </normal-table>
-        </table-container>
-      </div>
-    </div>
+            <normal-table
+              :data="list" :total="total" :columns="columns" :height="200" :query="listQuery"
+              :list-loading="loadingTable" @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="序号" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </table-container>
+        </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
diff --git a/src/views/home/device/count/components/header.vue b/src/views/home/device/count/components/header.vue
index 45abbdc..c1bc9bd 100644
--- a/src/views/home/device/count/components/header.vue
+++ b/src/views/home/device/count/components/header.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup name="DeviceReport">
 import { img } from './imgData'
 import { getDeviceReport, getDeviceRun } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备运行情况数据
 const runLoading = ref(true)
 const runData = ref([
@@ -90,133 +91,137 @@
 <template>
   <div class="header-container">
     <!-- 设备运行情况 -->
-    <div class="header-left">
-      <div class="title">
-        设备运行情况
-      </div>
-      <div v-loading="runLoading" class="content">
-        <div v-for="item in runData" :key="item.name" class="item">
-          <div class="img">
-            <img :src="item.img">
+    <layout class="left" title="设备运行情况">
+      <template #content>
+        <div v-loading="runLoading" class="content">
+          <div v-for="item in runData" :key="item.name" class="item">
+            <div class="img">
+              <img :src="item.img">
+            </div>
+            <div class="text">
+              <div class="name">
+                {{ item.name }}
+              </div>
+              <div class="value">
+                <span class="count"> {{ item.value }}</span>
+                <span class="unit"> {{ item.unit }}</span>
+              </div>
+            </div>
           </div>
-          <div class="text">
+        </div>
+      </template>
+    </layout>
+    <!-- 数据上报情况 -->
+    <layout class="right" title="数据上报情况">
+      <template #content>
+        <div v-loading="reportLoading" class="content">
+          <div v-for="item in reportData" :key="item.name" class="item">
             <div class="name">
               {{ item.name }}
             </div>
             <div class="value">
-              <span class="count"> {{ item.value }}</span>
+              <span class="conut"> {{ item.value }}</span>
               <span class="unit"> {{ item.unit }}</span>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!-- 数据上报情况 -->
-    <div class="header-right">
-      <div class="title">
-        数据上报情况
-      </div>
-      <div v-loading="reportLoading" class="content">
-        <div v-for="item in reportData" :key="item.name" class="item">
-          <div class="name">
-            {{ item.name }}
-          </div>
-          <div class="value">
-            <span class="conut"> {{ item.value }}</span>
-            <span class="unit"> {{ item.unit }}</span>
-          </div>
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
-  .header-left {
+  .left {
     width: 65%;
-    box-sizing: border-box;
-    padding: 10px;
+  }
 
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+  .content {
+    display: flex;
+    justify-content: space-around;
+    padding-top: 10px;
 
-    .content {
+    .item {
+      width: 21%;
+      box-sizing: border-box;
       display: flex;
+      // padding: 10px;
 
-      .item {
-        width: 25%;
-        box-sizing: border-box;
-        display: flex;
-        padding: 10px;
+      img {
+        width: 55px;
+        height: 55px;
+      }
 
-        img {
-          width: 55px;
-          height: 55px;
+      .text {
+        margin-left: 25px;
+
+        .name {
+          font-weight: 700;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
         }
 
-        .text {
-          margin-left: 25px;
+        .value {
+          // height: 27.5px;
+          // line-height: 27.5px;
+          // font-size: 22px;
 
-          .name {
+          .count {
+            font-size: 22px;
             font-weight: 700;
-            height: 27.5px;
-            line-height: 27.5px;
           }
 
-          .value {
-            height: 27.5px;
-            line-height: 27.5px;
-
-            .count {
-              font-size: 20px;
-              font-weight: 700;
-            }
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
           }
         }
       }
     }
   }
 
-  .header-right {
-    width: 35%;
+  .right {
+    width: 34%;
     box-sizing: border-box;
-    padding: 10px;
-
-    .title {
-      font-weight: 700;
-      font-size: 18px;
-      border-bottom: 1px solid #ccc;
-      padding-bottom: 5px;
-    }
+    // padding: 10px;
 
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-around;
 
       .item {
-        width: 45%;
+        width: 40%;
+        display: flex;
+        flex-wrap: wrap;
 
         .name {
+          // font-weight: 700;
           font-weight: 700;
-          height: 27.5px;
-          line-height: 27.5px;
+          font-size: 20px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
         }
 
         .value {
-          height: 27.5px;
-          line-height: 27.5px;
+          // height: 27.5px;
+          // line-height: 27.5px;
+          width: 51%;
 
           .conut {
-            font-size: 20px;
+            font-size: 22px;
             font-weight: 700;
           }
+
+          .unit {
+            padding-left: 5px;
+            font-size: 18px;
+          }
         }
       }
     }
diff --git a/src/views/home/device/count/components/imgData.ts b/src/views/home/device/count/components/imgData.ts
index 2346fd0..957ed4a 100644
--- a/src/views/home/device/count/components/imgData.ts
+++ b/src/views/home/device/count/components/imgData.ts
@@ -2,6 +2,6 @@
   online: new URL('@/assets/images/device/count/online.png', import.meta.url),
   offline: new URL('@/assets/images/device/count/offline.png', import.meta.url),
   stop: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  upkeep: new URL('@/assets/images/device/count/stop.png', import.meta.url),
-  backup: new URL('@/assets/images/device/count/stop.png', import.meta.url),
+  upkeep: new URL('@/assets/images/device/count/upkeep.png', import.meta.url),
+  backup: new URL('@/assets/images/device/count/backup.png', import.meta.url),
 }
diff --git a/src/views/home/device/count/components/middle.vue b/src/views/home/device/count/components/middle.vue
index 8967b40..9a32cfe 100644
--- a/src/views/home/device/count/components/middle.vue
+++ b/src/views/home/device/count/components/middle.vue
@@ -5,6 +5,7 @@
  -->
 <script lang="ts" setup name="DeviceTypeCount">
 import { getDeviceType, getOffline } from '@/api/home/device/count'
+import layout from '@/views/home/alarm/count/components/layout.vue'
 // 设备分类统计数据
 const deviceTypeLoading = ref(true)
 const xAxisData = ref([])
@@ -63,51 +64,54 @@
 <template>
   <div class="header-container">
     <!-- 设备分类统计 -->
-    <div class="header-left">
-      <div class="title">
-        设备分类统计
-      </div>
-      <div class="content">
-        <!-- 垂直柱状图 -->
-        <div v-loading="deviceTypeLoading" class="bar">
-          <bar-chart-horizontal
-            :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-left" title="设备分类统计">
+      <template #content>
+        <div class="content">
+          <!-- 垂直柱状图 -->
+          <div v-loading="deviceTypeLoading" class="bar">
+            <bar-chart-horizontal
+              v-show="xAxisData" :x-axis-data="xAxisData" :bar-coner="0" :data="data" :colors="[]"
+              :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!xAxisData" description="暂无数据" />
+          </div>
         </div>
-      </div>
-    </div>
+      </template>
+    </layout>
     <!-- 离线统计 -->
-    <div class="header-right">
-      <div class="title">
-        离线统计
-      </div>
-      <div v-loading="offLoading" class="content">
-        <!-- 柱状图 -->
-        <div class="bar">
-          <bar-chart-vertical
-            :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
-          />
+    <layout class="header-right" title="离线统计">
+      <template #content>
+        <div v-loading="offLoading" class="content">
+          <!-- 柱状图 -->
+          <div class="bar">
+            <bar-chart-vertical
+              v-show="xAxisDataOff" :x-axis-data="xAxisDataOff" :bar-coner="0" :data="dataOff" :colors="[]" :bar-width="15"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '10' }"
+            />
+            <el-empty v-show="!xAxisDataOff" description="暂无数据" />
+          </div>
+          <!-- 饼图 -->
+          <div class="circle">
+            <pie-chart
+              v-show="pieData" :data="pieData" radius="50%" label-position="" :label-show="false" label-formatter="" :show-emphasis="false"
+              :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '0' }"
+            />
+            <el-empty v-show="!pieData" description="暂无数据" />
+          </div>
         </div>
-        <!-- 饼图 -->
-        <div class="circle">
-          <pie-chart
-            :data="pieData" radius="50%" label-position="outside"
-            :legend="{ itemWidth: 8, itemHeight: 8, type: 'scroll', orient: 'horizontal', icon: 'roundRect', right: '0', top: '50' }"
-          />
-        </div>
-      </div>
-    </div>
+      </template>
+    </layout>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .header-container {
   display: flex;
+  justify-content: space-between;
 
   .header-left {
-    width: 50%;
+    width: 49%;
     box-sizing: border-box;
     padding: 10px;
 
@@ -144,9 +148,10 @@
     .content {
       display: flex;
       padding: 10px;
+      justify-content: space-between;
 
       .bar {
-        width: 60%;
+        width: 56%;
         height: 300px;
       }
 
diff --git a/src/views/home/device/count/index.vue b/src/views/home/device/count/index.vue
index 5d1de06..94f12de 100644
--- a/src/views/home/device/count/index.vue
+++ b/src/views/home/device/count/index.vue
@@ -14,12 +14,12 @@
   <app-container>
     <div>
       <!-- 设备运行情况和数据上报情况 -->
-      <header-card style="background-color: #fff; border-radius: 6px;" />
+      <header-card style="border-radius: 6px;" />
       <!-- 设备分类统计和离线统计 -->
-      <middle-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <middle-card style="border-radius: 6px; margin-top: 10px;" />
 
       <!-- 管理单位设备统计和离线设备清单 -->
-      <bottom-card style="background-color: #fff; border-radius: 6px; margin-top: 10px;" />
+      <bottom-card style="border-radius: 6px; margin-top: 10px;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/home/device/device/index.vue b/src/views/home/device/device/index.vue
index df2cf32..9e2e166 100644
--- a/src/views/home/device/device/index.vue
+++ b/src/views/home/device/device/index.vue
@@ -11,6 +11,7 @@
 import { getDictByCode } from '@/api/system/dict'
 import { getManufacturerListPage } from '@/api/home/device/product'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 const useStatusList = ref<{ id: string; name: string; value: string }[]>([]) // 设备在用情况
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -301,7 +302,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/device/instruction/index.vue b/src/views/home/device/instruction/index.vue
index 9a64512..1e598ed 100644
--- a/src/views/home/device/instruction/index.vue
+++ b/src/views/home/device/instruction/index.vue
@@ -10,6 +10,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getProductListPage } from '@/api/home/device/product'
 import { getDictByCode } from '@/api/system/dict'
+import { shortcuts } from '@/utils/common'
 const $route = useRoute()
 // 字典
 const deviceTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 设备类型
@@ -198,7 +199,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="操作开始时间" end-placeholder="操作结束时间"
           clearable
         />
diff --git a/src/views/home/ledger/sync/index.vue b/src/views/home/ledger/sync/index.vue
index 6607896..688e419 100644
--- a/src/views/home/ledger/sync/index.vue
+++ b/src/views/home/ledger/sync/index.vue
@@ -7,6 +7,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 // import { getSyncRecord } from '@/api/home/ledger/ledger'
+import { shortcuts } from '@/utils/common'
 const $router = useRouter()
 // 表格数据
 const list = ref([])
@@ -117,7 +118,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="同步开始时间" end-placeholder="同步结束时间"
           clearable
         />
diff --git a/src/views/home/operation/alarm/index.vue b/src/views/home/operation/alarm/index.vue
index dc0f53c..7527f72 100644
--- a/src/views/home/operation/alarm/index.vue
+++ b/src/views/home/operation/alarm/index.vue
@@ -7,7 +7,7 @@
 import { ElMessage } from 'element-plus'
 import { ArrowLeftBold, ArrowRightBold } from '@element-plus/icons-vue'
 import MapCom from './components/map.vue'
-
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list1 = ref<any[]>([])
 const total = ref(0)
@@ -250,7 +250,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/history/index.vue b/src/views/home/operation/history/index.vue
index 02ff9a3..bc9ae81 100644
--- a/src/views/home/operation/history/index.vue
+++ b/src/views/home/operation/history/index.vue
@@ -4,6 +4,7 @@
   Date: 2023-06-28
  -->
 <script lang="ts" setup name="HistoryAlarm">
+import { shortcuts } from '@/utils/common'
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -99,7 +100,7 @@
 
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="报警开始时间" end-placeholder="报警结束时间"
           clearable
         />
diff --git a/src/views/home/operation/manufacturer/index.vue b/src/views/home/operation/manufacturer/index.vue
index 76ce423..4a5816a 100644
--- a/src/views/home/operation/manufacturer/index.vue
+++ b/src/views/home/operation/manufacturer/index.vue
@@ -9,6 +9,7 @@
 import { getDeviceTypeListPage } from '@/api/home/device/type'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -163,7 +164,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />
diff --git a/src/views/home/operation/trajectory/index.vue b/src/views/home/operation/trajectory/index.vue
index 3ca678d..0a2feb3 100644
--- a/src/views/home/operation/trajectory/index.vue
+++ b/src/views/home/operation/trajectory/index.vue
@@ -5,8 +5,9 @@
  -->
 <script lang="ts" setup name="DeviceTrajectorySearch">
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { getDeviceTypeListPage } from '@/api/home/device/type'
-const deviceTypeList = ref<any[]>([]) // 设备类型列表
+import { getDeviceTypeListPage } from '@/api/home/device/type' // 设备类型列表
+import { shortcuts } from '@/utils/common'
+const deviceTypeList = ref<any[]>([])
 // 表格数据
 const list = ref([])
 const total = ref(0)
@@ -115,7 +116,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="上报开始时间" end-placeholder="上报结束时间"
           clearable
         />
diff --git a/src/views/home/station/operation/index.vue b/src/views/home/station/operation/index.vue
index 50ed2ab..4cb86b5 100644
--- a/src/views/home/station/operation/index.vue
+++ b/src/views/home/station/operation/index.vue
@@ -7,6 +7,7 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+import { shortcuts } from '@/utils/common'
 const deviceTypeList = ref<any[]>([]) // 设备类型列表
 const repairTypeList = ref<{ id: string; name: string; value: string }[]>([]) // 运维类型
 // 表格数据
@@ -145,7 +146,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss"
+          v-model="datetimerange" type="datetimerange" format="YYYY-MM-DD HH:mm:ss" :shortcuts="shortcuts"
           value-format="YYYY-MM-DD HH:mm:ss" range-separator="至" start-placeholder="维护开始时间" end-placeholder="维护结束时间"
           clearable
         />
diff --git a/src/views/system/manufacturer/editDialog.vue b/src/views/system/manufacturer/editDialog.vue
new file mode 100644
index 0000000..2dc6793
--- /dev/null
+++ b/src/views/system/manufacturer/editDialog.vue
@@ -0,0 +1,161 @@
+<!--
+  Description: 厂商管理-编辑或新建
+  Author: 李亚光
+  Date: 2023-09-13
+ -->
+<script lang="ts" setup name="EditManufacturer">
+import type { FormRules } from 'element-plus'
+import dayjs from 'dayjs'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { addManufacturer, editManufacturer } from '@/api/system/manufacturer'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  contact: '',
+  createTime: '',
+  name: '',
+  id: '',
+  tel: '',
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+} // 表头显示标题
+const rules: FormRules = {
+  name: [{ required: true, message: '厂商名称不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    contact: '',
+    createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    name: '',
+    id: '',
+    tel: '',
+  }
+}
+
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'edit') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = JSON.parse(JSON.stringify(row))
+  }
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      addManufacturer(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          resetForm()
+          nextTick(() => {
+            dataFormRef.value.clearValidate()
+          })
+          ElMessage.success('新增成功')
+          dialogFormVisible.value = false
+          // 通知父组件刷新状态
+          emits('refresh')
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      editManufacturer(dataForm.value).then((response) => {
+        if (response.code === 200) {
+          ElMessage({
+            message: '修改成功',
+            type: 'success',
+          })
+          dataFormRef.value.clearValidate()
+          emits('refresh')
+          dialogFormVisible.value = false
+        }
+      }).catch((_) => { // 异常情况，loading置为false
+      })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="厂商名称" prop="name">
+            <el-input v-model.trim="dataForm.name" type="text" placeholder="厂商名称" style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="联系人" prop="contact">
+            <el-input v-model.trim="dataForm.contact" type="text" placeholder="联系人" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="联系方式" prop="tel">
+            <el-input v-model.trim="dataForm.tel" type="text" placeholder="联系方式" style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="创建时间" prop="createTime">
+            <el-input v-model.trim="dataForm.createTime" type="text" placeholder="创建时间" style="width: 100%;" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          保存
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/manufacturer/index.vue b/src/views/system/manufacturer/index.vue
new file mode 100644
index 0000000..a356fbc
--- /dev/null
+++ b/src/views/system/manufacturer/index.vue
@@ -0,0 +1,142 @@
+<!--
+  Description: 厂商管理
+  Author: 李亚光
+  Date: 2023-09-13
+ -->
+<script lang="ts" setup name="ManufacturerManageList">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import editDialog from './editDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getManufacturerList, removeManufacturer } from '@/api/system/manufacturer'
+//  const { proxy } = getCurrentInstance() as any
+
+// 默认查询条件
+const defaultQuery = ref({
+  offset: 1,
+  limit: 20,
+  name: '',
+  contact: '',
+  tel: '',
+})
+const total = ref(0)
+// 搜索重置
+function reset() {
+  defaultQuery.value = {
+    offset: 1,
+    limit: 20,
+    name: '',
+    contact: '',
+    tel: '',
+  }
+  fetchData()
+}
+// 表格表头
+const columns = ref<TableColumn[]>([
+  { text: '厂商名称', value: 'name', align: 'center' },
+  { text: '厂商联系人', value: 'contact', align: 'center' },
+  { text: '厂商电话', value: 'tel', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+])
+// 数据列表
+const list = ref<any[]>([])
+const loading = ref(false)
+
+// 搜索按钮
+function search() {
+  fetchData()
+}
+// 查询数据
+function fetchData() {
+  loading.value = true
+  getManufacturerList(defaultQuery.value).then((res: { data: { rows: []; total: number } }) => {
+    list.value = res.data.rows
+    total.value = res.data.total
+    loading.value = false
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 删除行
+function removeRow(row: any) {
+  ElMessageBox.confirm(
+    `确定要删除${row.name}吗？`,
+    '确认删除',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    removeManufacturer(row.id).then(() => {
+      ElMessage.success('删除成功')
+      fetchData()
+    })
+  })
+}
+// 编辑或者新建
+const editRef = ref()
+const editRow = (type: string, row: any) => {
+  editRef.value.initDialog(type, row)
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+function changePage(val: { size: number; page: number }) {
+  if (val && val.size) {
+    defaultQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    defaultQuery.value.offset = val.page
+  }
+  fetchData()
+}
+
+onMounted(() => {
+  fetchData()
+})
+</script>
+
+<template>
+  <app-container>
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="defaultQuery.name" placeholder="厂商名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="defaultQuery.contact" placeholder="厂商联系人" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="defaultQuery.tel" placeholder="厂商电话" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="editRow('add', {})" />
+      </template>
+      <normal-table
+        :query="defaultQuery" :list-loading="loading" :columns="columns" :data="list" :total="total"
+        :border="false" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (defaultQuery.offset - 1) * defaultQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button type="primary" link size="small" class="table-text-button" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small" class="table-text-button" @click="removeRow(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>