diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
new file mode 100644
index 0000000..e43ca3c
--- /dev/null
+++ b/src/views/basic/device/detail.vue
@@ -0,0 +1,233 @@
+<!-- 设备详情 -->
+<script name="DeviceInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo } from './device-info'
+import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const radioItems = ref([
+  { name: '数据查询', value: 'device-data' },
+  { name: '下发配置', value: 'device-config' },
+  { name: '耗电分析', value: 'device-cell' },
+])
+const current = ref('')
+const currentLabel = ref('')
+
+const basicFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  deviceTypeName: '',
+  status: '',
+  statusName: '',
+  cell: '',
+  imei: '',
+  iccid: '',
+  model: '',
+  modelName: '',
+  productId: '',
+  productName: '',
+  encipherType: '',
+  encipherTypeName: '',
+  createTime: '',
+  createUserName: '',
+  dataValue: '',
+})
+
+// 逻辑
+const resetForm = () => {
+  router.go(-1)
+}
+
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  deviceInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 查询详情
+const detailById = (id: string) => {
+  detailDevice({ id }).then((res) => {
+    if (res.code === 200) {
+      deviceInfo.value = res.data
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'detail':
+      title.value = '设备详情'
+      id.value = params.id
+
+      detailById(id.value)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="deviceInfo" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="设备编号：">
+              {{ deviceInfo.devcode }}
+            </el-form-item>
+            <el-form-item label="设备IMEI：">
+              {{ deviceInfo.imei }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="所属产品：">
+              {{ deviceInfo.productName }}
+            </el-form-item>
+
+            <el-form-item label="ICCID：">
+              {{ deviceInfo.iccid }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="设备类型：">
+              {{ deviceInfo.deviceTypeName }}
+            </el-form-item>
+
+            <el-form-item label="加密方式：">
+              {{ deviceInfo.encipherTypeName }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="设备型号：">
+              {{ deviceInfo.modelName }}
+            </el-form-item>
+
+            <el-form-item label="创建时间：">
+              {{ deviceInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+        <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+      </el-radio-group>
+
+      <template v-if="current === 'device-data'" />
+
+      <template v-if="current === 'device-config'" />
+
+      <template v-if="current === 'device-cell'">
+        <detail-block :need-title="false" title="">
+          敬请期待
+        </detail-block>
+      </template>
+    </detail-page>
+  </app-container>
+</template>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
new file mode 100644
index 0000000..e43ca3c
--- /dev/null
+++ b/src/views/basic/device/detail.vue
@@ -0,0 +1,233 @@
+<!-- 设备详情 -->
+<script name="DeviceInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo } from './device-info'
+import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const radioItems = ref([
+  { name: '数据查询', value: 'device-data' },
+  { name: '下发配置', value: 'device-config' },
+  { name: '耗电分析', value: 'device-cell' },
+])
+const current = ref('')
+const currentLabel = ref('')
+
+const basicFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  deviceTypeName: '',
+  status: '',
+  statusName: '',
+  cell: '',
+  imei: '',
+  iccid: '',
+  model: '',
+  modelName: '',
+  productId: '',
+  productName: '',
+  encipherType: '',
+  encipherTypeName: '',
+  createTime: '',
+  createUserName: '',
+  dataValue: '',
+})
+
+// 逻辑
+const resetForm = () => {
+  router.go(-1)
+}
+
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  deviceInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 查询详情
+const detailById = (id: string) => {
+  detailDevice({ id }).then((res) => {
+    if (res.code === 200) {
+      deviceInfo.value = res.data
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'detail':
+      title.value = '设备详情'
+      id.value = params.id
+
+      detailById(id.value)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="deviceInfo" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="设备编号：">
+              {{ deviceInfo.devcode }}
+            </el-form-item>
+            <el-form-item label="设备IMEI：">
+              {{ deviceInfo.imei }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="所属产品：">
+              {{ deviceInfo.productName }}
+            </el-form-item>
+
+            <el-form-item label="ICCID：">
+              {{ deviceInfo.iccid }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="设备类型：">
+              {{ deviceInfo.deviceTypeName }}
+            </el-form-item>
+
+            <el-form-item label="加密方式：">
+              {{ deviceInfo.encipherTypeName }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="设备型号：">
+              {{ deviceInfo.modelName }}
+            </el-form-item>
+
+            <el-form-item label="创建时间：">
+              {{ deviceInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+        <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+      </el-radio-group>
+
+      <template v-if="current === 'device-data'" />
+
+      <template v-if="current === 'device-config'" />
+
+      <template v-if="current === 'device-cell'">
+        <detail-block :need-title="false" title="">
+          敬请期待
+        </detail-block>
+      </template>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
new file mode 100644
index 0000000..7a1c228
--- /dev/null
+++ b/src/views/basic/device/device-info.ts
@@ -0,0 +1,37 @@
+// 列表查询参数接口
+export interface IListQuery {
+  groupId: string // 分组
+  productId: string
+  devcode: string
+  imei: string
+  deviceType: string
+  status: string
+  beginCell: string // 电量
+  endCell: string //
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
+
+export interface IDeviceInfo {
+  id: string
+  devcode: string
+  deviceName: string
+  deviceType: string
+  deviceTypeName: string
+  status: string
+  statusName: string
+  cell: string
+  imei: string
+  iccid: string
+  model: string
+  modelName: string
+  productId: string
+  productName: string
+  encipherType: string
+  encipherTypeName: string
+  createTime: string
+  createUserName: string
+  dataValue: string
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
new file mode 100644
index 0000000..e43ca3c
--- /dev/null
+++ b/src/views/basic/device/detail.vue
@@ -0,0 +1,233 @@
+<!-- 设备详情 -->
+<script name="DeviceInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo } from './device-info'
+import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const radioItems = ref([
+  { name: '数据查询', value: 'device-data' },
+  { name: '下发配置', value: 'device-config' },
+  { name: '耗电分析', value: 'device-cell' },
+])
+const current = ref('')
+const currentLabel = ref('')
+
+const basicFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  deviceTypeName: '',
+  status: '',
+  statusName: '',
+  cell: '',
+  imei: '',
+  iccid: '',
+  model: '',
+  modelName: '',
+  productId: '',
+  productName: '',
+  encipherType: '',
+  encipherTypeName: '',
+  createTime: '',
+  createUserName: '',
+  dataValue: '',
+})
+
+// 逻辑
+const resetForm = () => {
+  router.go(-1)
+}
+
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  deviceInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 查询详情
+const detailById = (id: string) => {
+  detailDevice({ id }).then((res) => {
+    if (res.code === 200) {
+      deviceInfo.value = res.data
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'detail':
+      title.value = '设备详情'
+      id.value = params.id
+
+      detailById(id.value)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="deviceInfo" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="设备编号：">
+              {{ deviceInfo.devcode }}
+            </el-form-item>
+            <el-form-item label="设备IMEI：">
+              {{ deviceInfo.imei }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="所属产品：">
+              {{ deviceInfo.productName }}
+            </el-form-item>
+
+            <el-form-item label="ICCID：">
+              {{ deviceInfo.iccid }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="设备类型：">
+              {{ deviceInfo.deviceTypeName }}
+            </el-form-item>
+
+            <el-form-item label="加密方式：">
+              {{ deviceInfo.encipherTypeName }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="设备型号：">
+              {{ deviceInfo.modelName }}
+            </el-form-item>
+
+            <el-form-item label="创建时间：">
+              {{ deviceInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+        <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+      </el-radio-group>
+
+      <template v-if="current === 'device-data'" />
+
+      <template v-if="current === 'device-config'" />
+
+      <template v-if="current === 'device-cell'">
+        <detail-block :need-title="false" title="">
+          敬请期待
+        </detail-block>
+      </template>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
new file mode 100644
index 0000000..7a1c228
--- /dev/null
+++ b/src/views/basic/device/device-info.ts
@@ -0,0 +1,37 @@
+// 列表查询参数接口
+export interface IListQuery {
+  groupId: string // 分组
+  productId: string
+  devcode: string
+  imei: string
+  deviceType: string
+  status: string
+  beginCell: string // 电量
+  endCell: string //
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
+
+export interface IDeviceInfo {
+  id: string
+  devcode: string
+  deviceName: string
+  deviceType: string
+  deviceTypeName: string
+  status: string
+  statusName: string
+  cell: string
+  imei: string
+  iccid: string
+  model: string
+  modelName: string
+  productId: string
+  productName: string
+  encipherType: string
+  encipherTypeName: string
+  createTime: string
+  createUserName: string
+  dataValue: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
new file mode 100644
index 0000000..ba00120
--- /dev/null
+++ b/src/views/basic/device/list.vue
@@ -0,0 +1,314 @@
+<!-- 设备列表 -->
+<script name="DeviceList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from '../group/group-info'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo, IListQuery } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getGroupListPage } from '@/api/basic/group'
+import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+
+const router = useRouter()
+
+// 分组列表
+const groupList = ref<Array<IGroupInfo>>([])
+
+const cell = ref<string>('')
+const cellLevelList = [
+  { value: 1, name: '低于10%' },
+  { value: 2, name: '低于20%' },
+  { value: 3, name: '低于30%' },
+  { value: 4, name: '低于50%' },
+]
+
+// 查询条件
+const searchQuery = ref<IListQuery>({
+  groupId: '', // 分组
+  productId: '',
+  devcode: '',
+  imei: '',
+  deviceType: '',
+  status: '',
+  beginCell: '0', // 电量
+  endCell: '', //
+  offset: 1,
+  limit: 20,
+})
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '状态', value: 'status', align: 'center', width: '60' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
+  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
+  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
+  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
+  { text: '最新数据', value: 'dataValue', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '180' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const statusDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+
+// 跳转到新建的页面
+const exportAllDevice = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (dataList.value.length > 0) {
+    const exportQuery = searchQuery.value
+    delete exportQuery.limit
+    delete exportQuery.offset
+
+    // 导出接口
+    exportDevice(exportQuery).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  // 关闭loading
+  loading.close()
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('sealInfo', JSON.stringify(row))
+  router.push({
+    query: {
+      type: 'update',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+const searchList = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 重置
+const reset = () => {
+  searchQuery.value = {
+    groupId: '', // 分组
+    productId: '',
+    devcode: '',
+    imei: '',
+    deviceType: '',
+    status: '',
+    beginCell: '0', // 电量
+    endCell: '', //
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 删除
+const deleteById = (row: IDeviceInfo) => {
+  ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delDevice(row.id).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`设备 ${row.devcode} 删除成功`)
+        searchList()
+      }
+      else {
+        ElMessage.error(`设备 ${row.devcode} 删除失败: ${res.message}`)
+      }
+    })
+  })
+}
+
+// 获取在用状态字典值
+const getStatusDict = async () => {
+  getDictByCode('onlineStatus').then((res: any) => {
+    if (res.code === 200) {
+      statusDict.value = res.data
+      sessionStorage.setItem('onlineStatus', JSON.stringify(statusDict.value))
+    }
+  })
+}
+const getDeviceTypeDict = async () => {
+  getDictByCode('deviceType').then((res: any) => {
+    if (res.code === 200) {
+      deviceTypeDict.value = res.data
+      sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
+    }
+  })
+}
+const getAllGroupList = async () => {
+  await getGroupListPage({ offset: 1, limit: 20 }).then((res: any) => {
+    if (res.code === 200) {
+      groupList.value = res.data.rows
+    }
+  })
+}
+const getDict = async () => {
+  await getStatusDict()
+  await getDeviceTypeDict()
+  await getAllGroupList()
+}
+
+watch(() => cell.value, (val) => {
+  switch (val) {
+    case '1':
+      searchQuery.value.endCell = '10'
+      break
+
+    case '2':
+      searchQuery.value.endCell = '20'
+      break
+
+    case '3':
+      searchQuery.value.endCell = '30'
+      break
+
+    case '4':
+      searchQuery.value.endCell = '40'
+      break
+
+    default:
+      searchQuery.value.endCell = '100'
+      break
+  }
+})
+
+onMounted(async () => {
+  await getDict()
+  searchList()
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-select v-model="searchQuery.groupId" placeholder="请选择分组" clearable filterable>
+          <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.imei" placeholder="设备IMEI号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.deviceType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.status" placeholder="设备状态" clearable>
+          <el-option v-for="item in statusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-select v-model="cell" placeholder="设备电量" clearable>
+          <el-option v-for="item in cellLevelList" :key="item.value" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container title="设备列表">
+      <!-- 表头区域 -->
+      <template #btns-right>
+        <el-button type="primary" @click="exportDevice">
+          批量下发配置
+        </el-button>
+        <el-button type="primary" @click="exportAllDevice">
+          导出列表
+        </el-button>
+      </template>
+
+      <!-- 表格区域 -->
+      <normal-table
+        :data="dataList" :columns="columns" :total="total"
+        :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset! - 1) * searchQuery.limit! + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
new file mode 100644
index 0000000..e43ca3c
--- /dev/null
+++ b/src/views/basic/device/detail.vue
@@ -0,0 +1,233 @@
+<!-- 设备详情 -->
+<script name="DeviceInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo } from './device-info'
+import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const radioItems = ref([
+  { name: '数据查询', value: 'device-data' },
+  { name: '下发配置', value: 'device-config' },
+  { name: '耗电分析', value: 'device-cell' },
+])
+const current = ref('')
+const currentLabel = ref('')
+
+const basicFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  deviceTypeName: '',
+  status: '',
+  statusName: '',
+  cell: '',
+  imei: '',
+  iccid: '',
+  model: '',
+  modelName: '',
+  productId: '',
+  productName: '',
+  encipherType: '',
+  encipherTypeName: '',
+  createTime: '',
+  createUserName: '',
+  dataValue: '',
+})
+
+// 逻辑
+const resetForm = () => {
+  router.go(-1)
+}
+
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  deviceInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 查询详情
+const detailById = (id: string) => {
+  detailDevice({ id }).then((res) => {
+    if (res.code === 200) {
+      deviceInfo.value = res.data
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'detail':
+      title.value = '设备详情'
+      id.value = params.id
+
+      detailById(id.value)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="deviceInfo" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="设备编号：">
+              {{ deviceInfo.devcode }}
+            </el-form-item>
+            <el-form-item label="设备IMEI：">
+              {{ deviceInfo.imei }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="所属产品：">
+              {{ deviceInfo.productName }}
+            </el-form-item>
+
+            <el-form-item label="ICCID：">
+              {{ deviceInfo.iccid }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="设备类型：">
+              {{ deviceInfo.deviceTypeName }}
+            </el-form-item>
+
+            <el-form-item label="加密方式：">
+              {{ deviceInfo.encipherTypeName }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="设备型号：">
+              {{ deviceInfo.modelName }}
+            </el-form-item>
+
+            <el-form-item label="创建时间：">
+              {{ deviceInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+        <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+      </el-radio-group>
+
+      <template v-if="current === 'device-data'" />
+
+      <template v-if="current === 'device-config'" />
+
+      <template v-if="current === 'device-cell'">
+        <detail-block :need-title="false" title="">
+          敬请期待
+        </detail-block>
+      </template>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
new file mode 100644
index 0000000..7a1c228
--- /dev/null
+++ b/src/views/basic/device/device-info.ts
@@ -0,0 +1,37 @@
+// 列表查询参数接口
+export interface IListQuery {
+  groupId: string // 分组
+  productId: string
+  devcode: string
+  imei: string
+  deviceType: string
+  status: string
+  beginCell: string // 电量
+  endCell: string //
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
+
+export interface IDeviceInfo {
+  id: string
+  devcode: string
+  deviceName: string
+  deviceType: string
+  deviceTypeName: string
+  status: string
+  statusName: string
+  cell: string
+  imei: string
+  iccid: string
+  model: string
+  modelName: string
+  productId: string
+  productName: string
+  encipherType: string
+  encipherTypeName: string
+  createTime: string
+  createUserName: string
+  dataValue: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
new file mode 100644
index 0000000..ba00120
--- /dev/null
+++ b/src/views/basic/device/list.vue
@@ -0,0 +1,314 @@
+<!-- 设备列表 -->
+<script name="DeviceList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from '../group/group-info'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo, IListQuery } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getGroupListPage } from '@/api/basic/group'
+import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+
+const router = useRouter()
+
+// 分组列表
+const groupList = ref<Array<IGroupInfo>>([])
+
+const cell = ref<string>('')
+const cellLevelList = [
+  { value: 1, name: '低于10%' },
+  { value: 2, name: '低于20%' },
+  { value: 3, name: '低于30%' },
+  { value: 4, name: '低于50%' },
+]
+
+// 查询条件
+const searchQuery = ref<IListQuery>({
+  groupId: '', // 分组
+  productId: '',
+  devcode: '',
+  imei: '',
+  deviceType: '',
+  status: '',
+  beginCell: '0', // 电量
+  endCell: '', //
+  offset: 1,
+  limit: 20,
+})
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '状态', value: 'status', align: 'center', width: '60' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
+  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
+  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
+  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
+  { text: '最新数据', value: 'dataValue', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '180' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const statusDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+
+// 跳转到新建的页面
+const exportAllDevice = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (dataList.value.length > 0) {
+    const exportQuery = searchQuery.value
+    delete exportQuery.limit
+    delete exportQuery.offset
+
+    // 导出接口
+    exportDevice(exportQuery).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  // 关闭loading
+  loading.close()
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('sealInfo', JSON.stringify(row))
+  router.push({
+    query: {
+      type: 'update',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+const searchList = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 重置
+const reset = () => {
+  searchQuery.value = {
+    groupId: '', // 分组
+    productId: '',
+    devcode: '',
+    imei: '',
+    deviceType: '',
+    status: '',
+    beginCell: '0', // 电量
+    endCell: '', //
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 删除
+const deleteById = (row: IDeviceInfo) => {
+  ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delDevice(row.id).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`设备 ${row.devcode} 删除成功`)
+        searchList()
+      }
+      else {
+        ElMessage.error(`设备 ${row.devcode} 删除失败: ${res.message}`)
+      }
+    })
+  })
+}
+
+// 获取在用状态字典值
+const getStatusDict = async () => {
+  getDictByCode('onlineStatus').then((res: any) => {
+    if (res.code === 200) {
+      statusDict.value = res.data
+      sessionStorage.setItem('onlineStatus', JSON.stringify(statusDict.value))
+    }
+  })
+}
+const getDeviceTypeDict = async () => {
+  getDictByCode('deviceType').then((res: any) => {
+    if (res.code === 200) {
+      deviceTypeDict.value = res.data
+      sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
+    }
+  })
+}
+const getAllGroupList = async () => {
+  await getGroupListPage({ offset: 1, limit: 20 }).then((res: any) => {
+    if (res.code === 200) {
+      groupList.value = res.data.rows
+    }
+  })
+}
+const getDict = async () => {
+  await getStatusDict()
+  await getDeviceTypeDict()
+  await getAllGroupList()
+}
+
+watch(() => cell.value, (val) => {
+  switch (val) {
+    case '1':
+      searchQuery.value.endCell = '10'
+      break
+
+    case '2':
+      searchQuery.value.endCell = '20'
+      break
+
+    case '3':
+      searchQuery.value.endCell = '30'
+      break
+
+    case '4':
+      searchQuery.value.endCell = '40'
+      break
+
+    default:
+      searchQuery.value.endCell = '100'
+      break
+  }
+})
+
+onMounted(async () => {
+  await getDict()
+  searchList()
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-select v-model="searchQuery.groupId" placeholder="请选择分组" clearable filterable>
+          <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.imei" placeholder="设备IMEI号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.deviceType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.status" placeholder="设备状态" clearable>
+          <el-option v-for="item in statusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-select v-model="cell" placeholder="设备电量" clearable>
+          <el-option v-for="item in cellLevelList" :key="item.value" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container title="设备列表">
+      <!-- 表头区域 -->
+      <template #btns-right>
+        <el-button type="primary" @click="exportDevice">
+          批量下发配置
+        </el-button>
+        <el-button type="primary" @click="exportAllDevice">
+          导出列表
+        </el-button>
+      </template>
+
+      <!-- 表格区域 -->
+      <normal-table
+        :data="dataList" :columns="columns" :total="total"
+        :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset! - 1) * searchQuery.limit! + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/basic/group/addDialog.vue b/src/views/basic/group/addDialog.vue
new file mode 100644
index 0000000..d1f3405
--- /dev/null
+++ b/src/views/basic/group/addDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->
+<script name="AddGroupDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from './group-info'
+import { addGroup, updateGroup } from '@/api/basic/group'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const groupInfo = ref<IGroupInfo>({
+  id: '',
+  groupName: '',
+  deptid: '',
+  deptName: '',
+  descn: '',
+  createUserId: '',
+  createTime: '',
+})
+
+const groupInfoRules = ref({
+  groupName: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }],
+  deptid: [{ required: true, message: '所属组织不能为空，请选择', trigger: ['blur', 'change'] }],
+  descn: [{ required: true, message: '分组描述不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('groupInfo') // 返回列表时 将缓存中的数据删除
+
+  groupInfo.value = {
+    id: '',
+    groupName: '',
+    deptid: '',
+    deptName: '',
+    descn: '',
+    createUserId: '',
+    createTime: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  // 将创建时间改为提交的时间
+  groupInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增分组'
+
+      break
+    case 'update':
+      title.value = '编辑分组'
+      groupInfo.value = JSON.parse(sessionStorage.getItem('groupInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="groupInfo" :rules="groupInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row v-if="type === 'update'" :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组编号">
+              <el-input v-model="groupInfo.groupNo" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model="groupInfo.groupName" placeholder="请输入分组名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="所属组织" prop="deptid">
+              <dept-select v-model="groupInfo.deptid" placeholder="请选择所属组织" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组描述" prop="descn">
+              <el-input v-model="groupInfo.descn" placeholder="请输入分组描述" type="textarea" :rows="3" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
new file mode 100644
index 0000000..e43ca3c
--- /dev/null
+++ b/src/views/basic/device/detail.vue
@@ -0,0 +1,233 @@
+<!-- 设备详情 -->
+<script name="DeviceInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo } from './device-info'
+import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const radioItems = ref([
+  { name: '数据查询', value: 'device-data' },
+  { name: '下发配置', value: 'device-config' },
+  { name: '耗电分析', value: 'device-cell' },
+])
+const current = ref('')
+const currentLabel = ref('')
+
+const basicFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  deviceTypeName: '',
+  status: '',
+  statusName: '',
+  cell: '',
+  imei: '',
+  iccid: '',
+  model: '',
+  modelName: '',
+  productId: '',
+  productName: '',
+  encipherType: '',
+  encipherTypeName: '',
+  createTime: '',
+  createUserName: '',
+  dataValue: '',
+})
+
+// 逻辑
+const resetForm = () => {
+  router.go(-1)
+}
+
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  deviceInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 查询详情
+const detailById = (id: string) => {
+  detailDevice({ id }).then((res) => {
+    if (res.code === 200) {
+      deviceInfo.value = res.data
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'detail':
+      title.value = '设备详情'
+      id.value = params.id
+
+      detailById(id.value)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="deviceInfo" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="设备编号：">
+              {{ deviceInfo.devcode }}
+            </el-form-item>
+            <el-form-item label="设备IMEI：">
+              {{ deviceInfo.imei }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="所属产品：">
+              {{ deviceInfo.productName }}
+            </el-form-item>
+
+            <el-form-item label="ICCID：">
+              {{ deviceInfo.iccid }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="设备类型：">
+              {{ deviceInfo.deviceTypeName }}
+            </el-form-item>
+
+            <el-form-item label="加密方式：">
+              {{ deviceInfo.encipherTypeName }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="设备型号：">
+              {{ deviceInfo.modelName }}
+            </el-form-item>
+
+            <el-form-item label="创建时间：">
+              {{ deviceInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+        <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+      </el-radio-group>
+
+      <template v-if="current === 'device-data'" />
+
+      <template v-if="current === 'device-config'" />
+
+      <template v-if="current === 'device-cell'">
+        <detail-block :need-title="false" title="">
+          敬请期待
+        </detail-block>
+      </template>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
new file mode 100644
index 0000000..7a1c228
--- /dev/null
+++ b/src/views/basic/device/device-info.ts
@@ -0,0 +1,37 @@
+// 列表查询参数接口
+export interface IListQuery {
+  groupId: string // 分组
+  productId: string
+  devcode: string
+  imei: string
+  deviceType: string
+  status: string
+  beginCell: string // 电量
+  endCell: string //
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
+
+export interface IDeviceInfo {
+  id: string
+  devcode: string
+  deviceName: string
+  deviceType: string
+  deviceTypeName: string
+  status: string
+  statusName: string
+  cell: string
+  imei: string
+  iccid: string
+  model: string
+  modelName: string
+  productId: string
+  productName: string
+  encipherType: string
+  encipherTypeName: string
+  createTime: string
+  createUserName: string
+  dataValue: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
new file mode 100644
index 0000000..ba00120
--- /dev/null
+++ b/src/views/basic/device/list.vue
@@ -0,0 +1,314 @@
+<!-- 设备列表 -->
+<script name="DeviceList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from '../group/group-info'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo, IListQuery } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getGroupListPage } from '@/api/basic/group'
+import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+
+const router = useRouter()
+
+// 分组列表
+const groupList = ref<Array<IGroupInfo>>([])
+
+const cell = ref<string>('')
+const cellLevelList = [
+  { value: 1, name: '低于10%' },
+  { value: 2, name: '低于20%' },
+  { value: 3, name: '低于30%' },
+  { value: 4, name: '低于50%' },
+]
+
+// 查询条件
+const searchQuery = ref<IListQuery>({
+  groupId: '', // 分组
+  productId: '',
+  devcode: '',
+  imei: '',
+  deviceType: '',
+  status: '',
+  beginCell: '0', // 电量
+  endCell: '', //
+  offset: 1,
+  limit: 20,
+})
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '状态', value: 'status', align: 'center', width: '60' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
+  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
+  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
+  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
+  { text: '最新数据', value: 'dataValue', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '180' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const statusDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+
+// 跳转到新建的页面
+const exportAllDevice = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (dataList.value.length > 0) {
+    const exportQuery = searchQuery.value
+    delete exportQuery.limit
+    delete exportQuery.offset
+
+    // 导出接口
+    exportDevice(exportQuery).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  // 关闭loading
+  loading.close()
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('sealInfo', JSON.stringify(row))
+  router.push({
+    query: {
+      type: 'update',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+const searchList = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 重置
+const reset = () => {
+  searchQuery.value = {
+    groupId: '', // 分组
+    productId: '',
+    devcode: '',
+    imei: '',
+    deviceType: '',
+    status: '',
+    beginCell: '0', // 电量
+    endCell: '', //
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 删除
+const deleteById = (row: IDeviceInfo) => {
+  ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delDevice(row.id).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`设备 ${row.devcode} 删除成功`)
+        searchList()
+      }
+      else {
+        ElMessage.error(`设备 ${row.devcode} 删除失败: ${res.message}`)
+      }
+    })
+  })
+}
+
+// 获取在用状态字典值
+const getStatusDict = async () => {
+  getDictByCode('onlineStatus').then((res: any) => {
+    if (res.code === 200) {
+      statusDict.value = res.data
+      sessionStorage.setItem('onlineStatus', JSON.stringify(statusDict.value))
+    }
+  })
+}
+const getDeviceTypeDict = async () => {
+  getDictByCode('deviceType').then((res: any) => {
+    if (res.code === 200) {
+      deviceTypeDict.value = res.data
+      sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
+    }
+  })
+}
+const getAllGroupList = async () => {
+  await getGroupListPage({ offset: 1, limit: 20 }).then((res: any) => {
+    if (res.code === 200) {
+      groupList.value = res.data.rows
+    }
+  })
+}
+const getDict = async () => {
+  await getStatusDict()
+  await getDeviceTypeDict()
+  await getAllGroupList()
+}
+
+watch(() => cell.value, (val) => {
+  switch (val) {
+    case '1':
+      searchQuery.value.endCell = '10'
+      break
+
+    case '2':
+      searchQuery.value.endCell = '20'
+      break
+
+    case '3':
+      searchQuery.value.endCell = '30'
+      break
+
+    case '4':
+      searchQuery.value.endCell = '40'
+      break
+
+    default:
+      searchQuery.value.endCell = '100'
+      break
+  }
+})
+
+onMounted(async () => {
+  await getDict()
+  searchList()
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-select v-model="searchQuery.groupId" placeholder="请选择分组" clearable filterable>
+          <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.imei" placeholder="设备IMEI号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.deviceType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.status" placeholder="设备状态" clearable>
+          <el-option v-for="item in statusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-select v-model="cell" placeholder="设备电量" clearable>
+          <el-option v-for="item in cellLevelList" :key="item.value" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container title="设备列表">
+      <!-- 表头区域 -->
+      <template #btns-right>
+        <el-button type="primary" @click="exportDevice">
+          批量下发配置
+        </el-button>
+        <el-button type="primary" @click="exportAllDevice">
+          导出列表
+        </el-button>
+      </template>
+
+      <!-- 表格区域 -->
+      <normal-table
+        :data="dataList" :columns="columns" :total="total"
+        :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset! - 1) * searchQuery.limit! + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/basic/group/addDialog.vue b/src/views/basic/group/addDialog.vue
new file mode 100644
index 0000000..d1f3405
--- /dev/null
+++ b/src/views/basic/group/addDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->
+<script name="AddGroupDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from './group-info'
+import { addGroup, updateGroup } from '@/api/basic/group'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const groupInfo = ref<IGroupInfo>({
+  id: '',
+  groupName: '',
+  deptid: '',
+  deptName: '',
+  descn: '',
+  createUserId: '',
+  createTime: '',
+})
+
+const groupInfoRules = ref({
+  groupName: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }],
+  deptid: [{ required: true, message: '所属组织不能为空，请选择', trigger: ['blur', 'change'] }],
+  descn: [{ required: true, message: '分组描述不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('groupInfo') // 返回列表时 将缓存中的数据删除
+
+  groupInfo.value = {
+    id: '',
+    groupName: '',
+    deptid: '',
+    deptName: '',
+    descn: '',
+    createUserId: '',
+    createTime: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  // 将创建时间改为提交的时间
+  groupInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增分组'
+
+      break
+    case 'update':
+      title.value = '编辑分组'
+      groupInfo.value = JSON.parse(sessionStorage.getItem('groupInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="groupInfo" :rules="groupInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row v-if="type === 'update'" :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组编号">
+              <el-input v-model="groupInfo.groupNo" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model="groupInfo.groupName" placeholder="请输入分组名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="所属组织" prop="deptid">
+              <dept-select v-model="groupInfo.deptid" placeholder="请选择所属组织" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组描述" prop="descn">
+              <el-input v-model="groupInfo.descn" placeholder="请输入分组描述" type="textarea" :rows="3" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
new file mode 100644
index 0000000..d88ad97
--- /dev/null
+++ b/src/views/basic/group/detail.vue
@@ -0,0 +1,390 @@
+<!-- 分组详情 -->
+<script name="GroupInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from './group-info'
+import { detailGroup } from '@/api/basic/group'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const basicFormRef = ref()
+const refFilterDialog = ref()
+
+const sealInfo = ref<IGroupInfo>({
+  id: '',
+  sealNo: '',
+  sealName: '',
+  sealType: '',
+  sealTypeName: '',
+  status: '',
+  statusName: '',
+  applyTime: '',
+  abandonTime: '',
+  ratifyTime: '',
+  createTime: '',
+  approverId: '',
+  approverName: '',
+  minioFileName: '',
+  minioFileUrl: '',
+})
+
+const sealInfoRules = ref({
+  sealNo: [{ required: true, message: '印章编号不能为空', trigger: 'blur' }],
+  sealName: [{ required: true, message: '印章名称不能为空', trigger: 'blur' }],
+  sealType: [{ required: true, message: '印章类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  approverId: [{ required: true, message: '批准人不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空，请选择', trigger: 'blur' }],
+  ratifyTime: [{ required: true, message: '批准时间不能为空，请选择', trigger: 'blur' }],
+  status: [{ required: true, message: '在用状态不能为空，请选择', trigger: ['blur', 'change'] }],
+  minioFileName: [{ required: true, message: '图形不能为空，请选择一个文件上传', trigger: 'blur' }],
+}) // 表单验证规则
+
+const minioFileUrl = ref<string>('')
+
+// 逻辑
+
+const resetForm = () => {
+  sessionStorage.removeItem('sealInfo') // 返回列表时 将缓存中的数据删除
+  router.go(-1)
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  sealInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addSealInfo(sealInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '印章管理登记（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateSealInfo(sealInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '印章管理登记（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('上传成功')
+      sealInfo.value.minioFileName = res.data[0]
+      loading.close()
+
+      basicFormRef.value.validateField('minioFileName', () => {})
+    }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
+  })
+}
+
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+
+// 预览文件
+const previewSealImage = (url: string) => {
+  console.log(url)
+}
+
+// 从用户账号中筛选进行人员登记
+const showFilterSysUser = () => {
+  refFilterDialog.value.showOrHideFilterDialog(true)
+}
+
+const recordSelectedHandler = (row: any) => {
+  refFilterDialog.value.showOrHideFilterDialog(false)
+  sealInfo.value.approverName = row.name
+  sealInfo.value.approverId = row.id
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '印章管理登记（新增）'
+
+      // 创建时间设置默认值
+      sealInfo.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+
+      break
+    case 'update':
+      title.value = '印章管理登记（编辑）'
+      id.value = params.id
+
+      sealInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+
+      break
+    case 'detail':
+      title.value = '印章管理登记（详情）'
+      id.value = params.id
+
+      sealInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+// 监听 显示中文 立即监听
+watch(() => sealInfo.value.sealType, (newVal) => {
+  if (sealTypeDict.value.length === 0) {
+    sealTypeDict.value = JSON.parse(sessionStorage.getItem('bizSealType')!)
+  }
+  const targetList = sealTypeDict.value.filter(item => item.value === newVal)
+  if (targetList.length > 0) {
+    sealInfo.value.sealTypeName = targetList[0].name
+  }
+  else {
+    sealInfo.value.sealTypeName = ''
+  }
+}, { immediate: true })
+
+// 监听 显示中文 立即监听
+watch(() => sealInfo.value.status, (newVal) => {
+  if (sealStatusDict.value.length === 0) {
+    sealStatusDict.value = JSON.parse(sessionStorage.getItem('bizSealStatus')!)
+  }
+  const targetList = sealStatusDict.value.filter(item => item.value === newVal)
+  if (targetList.length > 0) {
+    sealInfo.value.statusName = targetList[0].name
+  }
+  else {
+    sealInfo.value.statusName = ''
+  }
+}, { immediate: true })
+
+watch(() => sealInfo.value.minioFileName, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        minioFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button v-if="type !== 'detail'" type="primary" @click="saveForm()">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="sealInfo" :rules="sealInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="印章编号" prop="sealNo">
+              <el-input v-model="sealInfo.sealNo" placeholder="请输入印章编号" tabindex="1" :clearable="true" :disabled="type === 'detail'" />
+            </el-form-item>
+
+            <el-form-item label="申请时间" prop="applyTime">
+              <el-date-picker
+                v-model="sealInfo.applyTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择申请时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="5"
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="印章名称" prop="sealName">
+              <el-input v-model="sealInfo.sealName" :clearable="true" placeholder="请输入印章名称" tabindex="2" :disabled="type === 'detail'" />
+            </el-form-item>
+
+            <el-form-item label="批准时间" prop="ratifyTime">
+              <el-date-picker
+                v-model="sealInfo.ratifyTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择批准时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="6"
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="印章类型" prop="sealType">
+              <el-select v-model="sealInfo.sealType" placeholder="请选择印章类型" tabindex="3" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in sealTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+              <el-input v-model="sealInfo.sealTypeName" type="hidden" />
+            </el-form-item>
+
+            <el-form-item label="在用状态" prop="status">
+              <el-select v-model="sealInfo.status" placeholder="请选择是否在用" tabindex="7" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in sealStatusDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+              <el-input v-model="sealInfo.statusName" type="hidden" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="批准人" prop="approverId">
+              <el-input v-model="sealInfo.approverName" :clearable="true" :readonly="true" placeholder="请选择批准人" tabindex="4" :disabled="type === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterSysUser">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <el-input v-model="sealInfo.approverId" type="hidden" />
+            </el-form-item>
+
+            <el-form-item label="报废时间">
+              <el-date-picker
+                v-model="sealInfo.abandonTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择批准时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="8"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第四行 -->
+        <el-row :gutter="24">
+          <el-col :span="20">
+            <el-form-item label="图形" prop="minioFileName">
+              <el-input v-model="sealInfo.minioFileName" type="hidden" />
+
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                accept="image/png, image/jpeg,image/jpg"
+                style="width: 50%; margin-left: 20px;"
+                :disabled="type === 'detail'"
+                tabindex="9"
+              >
+                <el-image v-if="sealInfo.minioFileName" :src="minioFileUrl" class="avatar" fit="contain" @click="previewSealImage" />
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+
+    <filter-sys-user ref="refFilterDialog" @record-selected="recordSelectedHandler" />
+  </app-container>
+</template>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
+}
+</style>
+./group-info

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
new file mode 100644
index 0000000..e43ca3c
--- /dev/null
+++ b/src/views/basic/device/detail.vue
@@ -0,0 +1,233 @@
+<!-- 设备详情 -->
+<script name="DeviceInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo } from './device-info'
+import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const radioItems = ref([
+  { name: '数据查询', value: 'device-data' },
+  { name: '下发配置', value: 'device-config' },
+  { name: '耗电分析', value: 'device-cell' },
+])
+const current = ref('')
+const currentLabel = ref('')
+
+const basicFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  deviceTypeName: '',
+  status: '',
+  statusName: '',
+  cell: '',
+  imei: '',
+  iccid: '',
+  model: '',
+  modelName: '',
+  productId: '',
+  productName: '',
+  encipherType: '',
+  encipherTypeName: '',
+  createTime: '',
+  createUserName: '',
+  dataValue: '',
+})
+
+// 逻辑
+const resetForm = () => {
+  router.go(-1)
+}
+
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  deviceInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 查询详情
+const detailById = (id: string) => {
+  detailDevice({ id }).then((res) => {
+    if (res.code === 200) {
+      deviceInfo.value = res.data
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'detail':
+      title.value = '设备详情'
+      id.value = params.id
+
+      detailById(id.value)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="deviceInfo" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="设备编号：">
+              {{ deviceInfo.devcode }}
+            </el-form-item>
+            <el-form-item label="设备IMEI：">
+              {{ deviceInfo.imei }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="所属产品：">
+              {{ deviceInfo.productName }}
+            </el-form-item>
+
+            <el-form-item label="ICCID：">
+              {{ deviceInfo.iccid }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="设备类型：">
+              {{ deviceInfo.deviceTypeName }}
+            </el-form-item>
+
+            <el-form-item label="加密方式：">
+              {{ deviceInfo.encipherTypeName }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="设备型号：">
+              {{ deviceInfo.modelName }}
+            </el-form-item>
+
+            <el-form-item label="创建时间：">
+              {{ deviceInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+        <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+      </el-radio-group>
+
+      <template v-if="current === 'device-data'" />
+
+      <template v-if="current === 'device-config'" />
+
+      <template v-if="current === 'device-cell'">
+        <detail-block :need-title="false" title="">
+          敬请期待
+        </detail-block>
+      </template>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
new file mode 100644
index 0000000..7a1c228
--- /dev/null
+++ b/src/views/basic/device/device-info.ts
@@ -0,0 +1,37 @@
+// 列表查询参数接口
+export interface IListQuery {
+  groupId: string // 分组
+  productId: string
+  devcode: string
+  imei: string
+  deviceType: string
+  status: string
+  beginCell: string // 电量
+  endCell: string //
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
+
+export interface IDeviceInfo {
+  id: string
+  devcode: string
+  deviceName: string
+  deviceType: string
+  deviceTypeName: string
+  status: string
+  statusName: string
+  cell: string
+  imei: string
+  iccid: string
+  model: string
+  modelName: string
+  productId: string
+  productName: string
+  encipherType: string
+  encipherTypeName: string
+  createTime: string
+  createUserName: string
+  dataValue: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
new file mode 100644
index 0000000..ba00120
--- /dev/null
+++ b/src/views/basic/device/list.vue
@@ -0,0 +1,314 @@
+<!-- 设备列表 -->
+<script name="DeviceList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from '../group/group-info'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo, IListQuery } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getGroupListPage } from '@/api/basic/group'
+import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+
+const router = useRouter()
+
+// 分组列表
+const groupList = ref<Array<IGroupInfo>>([])
+
+const cell = ref<string>('')
+const cellLevelList = [
+  { value: 1, name: '低于10%' },
+  { value: 2, name: '低于20%' },
+  { value: 3, name: '低于30%' },
+  { value: 4, name: '低于50%' },
+]
+
+// 查询条件
+const searchQuery = ref<IListQuery>({
+  groupId: '', // 分组
+  productId: '',
+  devcode: '',
+  imei: '',
+  deviceType: '',
+  status: '',
+  beginCell: '0', // 电量
+  endCell: '', //
+  offset: 1,
+  limit: 20,
+})
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '状态', value: 'status', align: 'center', width: '60' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
+  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
+  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
+  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
+  { text: '最新数据', value: 'dataValue', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '180' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const statusDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+
+// 跳转到新建的页面
+const exportAllDevice = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (dataList.value.length > 0) {
+    const exportQuery = searchQuery.value
+    delete exportQuery.limit
+    delete exportQuery.offset
+
+    // 导出接口
+    exportDevice(exportQuery).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  // 关闭loading
+  loading.close()
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('sealInfo', JSON.stringify(row))
+  router.push({
+    query: {
+      type: 'update',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+const searchList = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 重置
+const reset = () => {
+  searchQuery.value = {
+    groupId: '', // 分组
+    productId: '',
+    devcode: '',
+    imei: '',
+    deviceType: '',
+    status: '',
+    beginCell: '0', // 电量
+    endCell: '', //
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 删除
+const deleteById = (row: IDeviceInfo) => {
+  ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delDevice(row.id).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`设备 ${row.devcode} 删除成功`)
+        searchList()
+      }
+      else {
+        ElMessage.error(`设备 ${row.devcode} 删除失败: ${res.message}`)
+      }
+    })
+  })
+}
+
+// 获取在用状态字典值
+const getStatusDict = async () => {
+  getDictByCode('onlineStatus').then((res: any) => {
+    if (res.code === 200) {
+      statusDict.value = res.data
+      sessionStorage.setItem('onlineStatus', JSON.stringify(statusDict.value))
+    }
+  })
+}
+const getDeviceTypeDict = async () => {
+  getDictByCode('deviceType').then((res: any) => {
+    if (res.code === 200) {
+      deviceTypeDict.value = res.data
+      sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
+    }
+  })
+}
+const getAllGroupList = async () => {
+  await getGroupListPage({ offset: 1, limit: 20 }).then((res: any) => {
+    if (res.code === 200) {
+      groupList.value = res.data.rows
+    }
+  })
+}
+const getDict = async () => {
+  await getStatusDict()
+  await getDeviceTypeDict()
+  await getAllGroupList()
+}
+
+watch(() => cell.value, (val) => {
+  switch (val) {
+    case '1':
+      searchQuery.value.endCell = '10'
+      break
+
+    case '2':
+      searchQuery.value.endCell = '20'
+      break
+
+    case '3':
+      searchQuery.value.endCell = '30'
+      break
+
+    case '4':
+      searchQuery.value.endCell = '40'
+      break
+
+    default:
+      searchQuery.value.endCell = '100'
+      break
+  }
+})
+
+onMounted(async () => {
+  await getDict()
+  searchList()
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-select v-model="searchQuery.groupId" placeholder="请选择分组" clearable filterable>
+          <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.imei" placeholder="设备IMEI号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.deviceType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.status" placeholder="设备状态" clearable>
+          <el-option v-for="item in statusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-select v-model="cell" placeholder="设备电量" clearable>
+          <el-option v-for="item in cellLevelList" :key="item.value" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container title="设备列表">
+      <!-- 表头区域 -->
+      <template #btns-right>
+        <el-button type="primary" @click="exportDevice">
+          批量下发配置
+        </el-button>
+        <el-button type="primary" @click="exportAllDevice">
+          导出列表
+        </el-button>
+      </template>
+
+      <!-- 表格区域 -->
+      <normal-table
+        :data="dataList" :columns="columns" :total="total"
+        :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset! - 1) * searchQuery.limit! + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/basic/group/addDialog.vue b/src/views/basic/group/addDialog.vue
new file mode 100644
index 0000000..d1f3405
--- /dev/null
+++ b/src/views/basic/group/addDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->
+<script name="AddGroupDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from './group-info'
+import { addGroup, updateGroup } from '@/api/basic/group'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const groupInfo = ref<IGroupInfo>({
+  id: '',
+  groupName: '',
+  deptid: '',
+  deptName: '',
+  descn: '',
+  createUserId: '',
+  createTime: '',
+})
+
+const groupInfoRules = ref({
+  groupName: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }],
+  deptid: [{ required: true, message: '所属组织不能为空，请选择', trigger: ['blur', 'change'] }],
+  descn: [{ required: true, message: '分组描述不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('groupInfo') // 返回列表时 将缓存中的数据删除
+
+  groupInfo.value = {
+    id: '',
+    groupName: '',
+    deptid: '',
+    deptName: '',
+    descn: '',
+    createUserId: '',
+    createTime: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  // 将创建时间改为提交的时间
+  groupInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增分组'
+
+      break
+    case 'update':
+      title.value = '编辑分组'
+      groupInfo.value = JSON.parse(sessionStorage.getItem('groupInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="groupInfo" :rules="groupInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row v-if="type === 'update'" :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组编号">
+              <el-input v-model="groupInfo.groupNo" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model="groupInfo.groupName" placeholder="请输入分组名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="所属组织" prop="deptid">
+              <dept-select v-model="groupInfo.deptid" placeholder="请选择所属组织" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组描述" prop="descn">
+              <el-input v-model="groupInfo.descn" placeholder="请输入分组描述" type="textarea" :rows="3" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
new file mode 100644
index 0000000..d88ad97
--- /dev/null
+++ b/src/views/basic/group/detail.vue
@@ -0,0 +1,390 @@
+<!-- 分组详情 -->
+<script name="GroupInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from './group-info'
+import { detailGroup } from '@/api/basic/group'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const basicFormRef = ref()
+const refFilterDialog = ref()
+
+const sealInfo = ref<IGroupInfo>({
+  id: '',
+  sealNo: '',
+  sealName: '',
+  sealType: '',
+  sealTypeName: '',
+  status: '',
+  statusName: '',
+  applyTime: '',
+  abandonTime: '',
+  ratifyTime: '',
+  createTime: '',
+  approverId: '',
+  approverName: '',
+  minioFileName: '',
+  minioFileUrl: '',
+})
+
+const sealInfoRules = ref({
+  sealNo: [{ required: true, message: '印章编号不能为空', trigger: 'blur' }],
+  sealName: [{ required: true, message: '印章名称不能为空', trigger: 'blur' }],
+  sealType: [{ required: true, message: '印章类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  approverId: [{ required: true, message: '批准人不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空，请选择', trigger: 'blur' }],
+  ratifyTime: [{ required: true, message: '批准时间不能为空，请选择', trigger: 'blur' }],
+  status: [{ required: true, message: '在用状态不能为空，请选择', trigger: ['blur', 'change'] }],
+  minioFileName: [{ required: true, message: '图形不能为空，请选择一个文件上传', trigger: 'blur' }],
+}) // 表单验证规则
+
+const minioFileUrl = ref<string>('')
+
+// 逻辑
+
+const resetForm = () => {
+  sessionStorage.removeItem('sealInfo') // 返回列表时 将缓存中的数据删除
+  router.go(-1)
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  sealInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addSealInfo(sealInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '印章管理登记（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateSealInfo(sealInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '印章管理登记（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('上传成功')
+      sealInfo.value.minioFileName = res.data[0]
+      loading.close()
+
+      basicFormRef.value.validateField('minioFileName', () => {})
+    }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
+  })
+}
+
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+
+// 预览文件
+const previewSealImage = (url: string) => {
+  console.log(url)
+}
+
+// 从用户账号中筛选进行人员登记
+const showFilterSysUser = () => {
+  refFilterDialog.value.showOrHideFilterDialog(true)
+}
+
+const recordSelectedHandler = (row: any) => {
+  refFilterDialog.value.showOrHideFilterDialog(false)
+  sealInfo.value.approverName = row.name
+  sealInfo.value.approverId = row.id
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '印章管理登记（新增）'
+
+      // 创建时间设置默认值
+      sealInfo.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+
+      break
+    case 'update':
+      title.value = '印章管理登记（编辑）'
+      id.value = params.id
+
+      sealInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+
+      break
+    case 'detail':
+      title.value = '印章管理登记（详情）'
+      id.value = params.id
+
+      sealInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+// 监听 显示中文 立即监听
+watch(() => sealInfo.value.sealType, (newVal) => {
+  if (sealTypeDict.value.length === 0) {
+    sealTypeDict.value = JSON.parse(sessionStorage.getItem('bizSealType')!)
+  }
+  const targetList = sealTypeDict.value.filter(item => item.value === newVal)
+  if (targetList.length > 0) {
+    sealInfo.value.sealTypeName = targetList[0].name
+  }
+  else {
+    sealInfo.value.sealTypeName = ''
+  }
+}, { immediate: true })
+
+// 监听 显示中文 立即监听
+watch(() => sealInfo.value.status, (newVal) => {
+  if (sealStatusDict.value.length === 0) {
+    sealStatusDict.value = JSON.parse(sessionStorage.getItem('bizSealStatus')!)
+  }
+  const targetList = sealStatusDict.value.filter(item => item.value === newVal)
+  if (targetList.length > 0) {
+    sealInfo.value.statusName = targetList[0].name
+  }
+  else {
+    sealInfo.value.statusName = ''
+  }
+}, { immediate: true })
+
+watch(() => sealInfo.value.minioFileName, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        minioFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button v-if="type !== 'detail'" type="primary" @click="saveForm()">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="sealInfo" :rules="sealInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="印章编号" prop="sealNo">
+              <el-input v-model="sealInfo.sealNo" placeholder="请输入印章编号" tabindex="1" :clearable="true" :disabled="type === 'detail'" />
+            </el-form-item>
+
+            <el-form-item label="申请时间" prop="applyTime">
+              <el-date-picker
+                v-model="sealInfo.applyTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择申请时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="5"
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="印章名称" prop="sealName">
+              <el-input v-model="sealInfo.sealName" :clearable="true" placeholder="请输入印章名称" tabindex="2" :disabled="type === 'detail'" />
+            </el-form-item>
+
+            <el-form-item label="批准时间" prop="ratifyTime">
+              <el-date-picker
+                v-model="sealInfo.ratifyTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择批准时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="6"
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="印章类型" prop="sealType">
+              <el-select v-model="sealInfo.sealType" placeholder="请选择印章类型" tabindex="3" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in sealTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+              <el-input v-model="sealInfo.sealTypeName" type="hidden" />
+            </el-form-item>
+
+            <el-form-item label="在用状态" prop="status">
+              <el-select v-model="sealInfo.status" placeholder="请选择是否在用" tabindex="7" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in sealStatusDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+              <el-input v-model="sealInfo.statusName" type="hidden" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="批准人" prop="approverId">
+              <el-input v-model="sealInfo.approverName" :clearable="true" :readonly="true" placeholder="请选择批准人" tabindex="4" :disabled="type === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterSysUser">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <el-input v-model="sealInfo.approverId" type="hidden" />
+            </el-form-item>
+
+            <el-form-item label="报废时间">
+              <el-date-picker
+                v-model="sealInfo.abandonTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择批准时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="8"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第四行 -->
+        <el-row :gutter="24">
+          <el-col :span="20">
+            <el-form-item label="图形" prop="minioFileName">
+              <el-input v-model="sealInfo.minioFileName" type="hidden" />
+
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                accept="image/png, image/jpeg,image/jpg"
+                style="width: 50%; margin-left: 20px;"
+                :disabled="type === 'detail'"
+                tabindex="9"
+              >
+                <el-image v-if="sealInfo.minioFileName" :src="minioFileUrl" class="avatar" fit="contain" @click="previewSealImage" />
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+
+    <filter-sys-user ref="refFilterDialog" @record-selected="recordSelectedHandler" />
+  </app-container>
+</template>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
+}
+</style>
+./group-info
diff --git a/src/views/basic/group/group-info.ts b/src/views/basic/group/group-info.ts
new file mode 100644
index 0000000..00bbef6
--- /dev/null
+++ b/src/views/basic/group/group-info.ts
@@ -0,0 +1,23 @@
+// 列表查询参数接口
+export interface IListQuery {
+  ids?: [] // id列表 导出用
+  groupNo?: string
+  groupName: string // 分组名
+  beginTime: string // 创建时间-开始
+  endTime: string // 创建时间-结束
+  offset: number
+  limit: number
+  sort?: string
+  order?: string
+}
+
+export interface IGroupInfo {
+  id: string // id
+  groupNo?: string // 分组编号
+  groupName: string // 分组名称
+  deptid: string // 所属组织
+  deptName: string // 所属组织名称
+  descn: string // 分组描述
+  createUserId: string
+  createTime?: string
+}

diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
new file mode 100644
index 0000000..63d7803
--- /dev/null
+++ b/src/api/basic/device.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'device'
+
+// 查询设备列表 分页
+export function getDeviceListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询设备详情
+export function detailDevice(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出
+export function exportDevice(data: object) {
+  return request({
+    url: `${prefix}/list-export`,
+    responseType: 'blob',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加分组
+export function addDevice(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateDevice(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除设备
+export function delDevice(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
+
+// 批量删除设备
+export function delDeviceBatch(ids: []) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/group.ts b/src/api/basic/group.ts
new file mode 100644
index 0000000..a20dea4
--- /dev/null
+++ b/src/api/basic/group.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'device/group'
+
+// 查询分组列表 分页
+export function getGroupListPage(data: object) {
+  return request({
+    url: `${prefix}/list-page`,
+    method: 'post',
+    data,
+  })
+}
+// 查询分组详情
+export function detailGroup(data: object) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+// 资源树列表
+export function getResourceTreeList() {
+  return request({
+    url: `${prefix}/resource/tree`,
+    method: 'get',
+  })
+}
+
+// 资源类型列表
+export function getResourceTypeList() {
+  return request({
+    url: `${prefix}/dict/code/resourceType`,
+    method: 'get',
+  })
+}
+
+// 添加分组
+export function addGroup(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改分组
+export function updateGroup(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除分组
+export function delGroup(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/assets/icons/icon-equipment-info.svg b/src/assets/icons/icon-equipment-info.svg
new file mode 100644
index 0000000..2938091
--- /dev/null
+++ b/src/assets/icons/icon-equipment-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689822436218" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1985" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M73.142857 0h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V73.142857a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 0 0 0 73.142857h219.428571a36.571429 36.571429 0 0 0 0-73.142857h-219.428571zM73.142857 585.142857h877.714286a73.142857 73.142857 0 0 1 73.142857 73.142857v292.571429a73.142857 73.142857 0 0 1-73.142857 73.142857H73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857V658.285714a73.142857 73.142857 0 0 1 73.142857-73.142857z m109.714286 146.285714a36.571429 36.571429 0 1 0 0 73.142858h219.428571a36.571429 36.571429 0 1 0 0-73.142858h-219.428571z" p-id="1986"></path></svg>
diff --git a/src/assets/icons/icon-standard-status.svg b/src/assets/icons/icon-standard-status.svg
new file mode 100644
index 0000000..39427e8
--- /dev/null
+++ b/src/assets/icons/icon-standard-status.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1694422026210" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4433" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M187.97568 565.98528c14.88896 73.1648 51.58912 138.98752 106.09664 190.31552a32.68608 32.68608 0 0 0 27.1872 8.56064 32.7424 32.7424 0 0 0 23.60832-16.00512l42.56768-73.72288a32.768 32.768 0 0 0-4.096-38.36928 214.13376 214.13376 0 0 1-47.39072-86.06208 32.75264 32.75264 0 0 0-31.55456-24.00256H220.05248a32.68096 32.68096 0 0 0-25.34912 12.03712 32.65024 32.65024 0 0 0-6.72768 27.24864zM621.11744 717.53728a32.70656 32.70656 0 0 0-35.3536-15.64672 210.88256 210.88256 0 0 1-106.46016-4.22912 32.78336 32.78336 0 0 0-37.90848 14.9504l-41.78944 72.4224a32.74752 32.74752 0 0 0-2.42688 27.48416 32.62464 32.62464 0 0 0 19.44576 19.57376c39.58784 14.62272 81.40288 22.0416 124.2368 22.0416 35.41504 0 70.37952-5.11488 103.89504-15.22176a32.82944 32.82944 0 0 0 20.992-19.28192 32.73216 32.73216 0 0 0-2.0992-28.4416l-42.53184-73.6512zM771.584 217.3696a32.70144 32.70144 0 0 0-20.96128-7.60832c-1.89952 0-3.83488 0.19968-5.7344 0.52736a32.73728 32.73728 0 0 0-22.59968 15.872l-41.8816 72.47872a32.80384 32.80384 0 0 0 6.00064 40.30976 210.65216 210.65216 0 0 1 59.36128 98.19136 32.768 32.768 0 0 0 31.58528 24.07424h84.352a32.75776 32.75776 0 0 0 25.3184-12.00128 32.62464 32.62464 0 0 0 6.75328-27.22304c-16.09728-79.7696-59.48928-152.44288-122.19392-204.6208zM665.74848 168.27392a32.76288 32.76288 0 0 0-20.992-19.28704 359.80288 359.80288 0 0 0-103.89504-15.25248c-42.83392 0-84.64896 7.41376-124.2368 22.03648a32.78336 32.78336 0 0 0-17.01888 47.104l41.78944 72.41216a32.78336 32.78336 0 0 0 37.90848 14.9504 210.7392 210.7392 0 0 1 61.56288-9.14944c14.98624 0 30.1056 1.6384 44.89728 4.8896a32.74752 32.74752 0 0 0 35.3536-15.61088l42.53696-73.66144a32.70656 32.70656 0 0 0 2.09408-28.43136zM861.70624 526.6944h-84.352a32.73216 32.73216 0 0 0-31.58528 24.06912 210.74944 210.74944 0 0 1-59.36128 98.19648 32.73728 32.73728 0 0 0-6.00064 40.2688l41.8816 72.50944a32.70144 32.70144 0 0 0 22.59968 15.87712c1.89952 0.32768 3.83488 0.49152 5.7344 0.49152a32.67584 32.67584 0 0 0 20.96128-7.57248c62.70464-52.21376 106.09664-124.85632 122.19392-204.61568a32.6144 32.6144 0 0 0-6.75328-27.22304 32.6656 32.6656 0 0 0-25.3184-12.00128zM194.69824 449.17248a32.69632 32.69632 0 0 0 25.34912 12.03712h84.352a32.75776 32.75776 0 0 0 31.55456-24.00256 214.15424 214.15424 0 0 1 47.39072-86.0928 32.7168 32.7168 0 0 0 4.096-38.33856L344.87296 239.0528a32.8704 32.8704 0 0 0-23.60832-16.03584 32.70656 32.70656 0 0 0-4.75648-0.32768c-8.26368 0-16.3328 3.1488-22.43072 8.91904C239.5648 282.9312 202.86464 348.7488 187.97568 421.91872a32.68608 32.68608 0 0 0 6.72256 27.25376z" p-id="4434"></path></svg>
diff --git a/src/components/DetailPage/DetailBlock.vue b/src/components/DetailPage/DetailBlock.vue
index f886f0f..14344c5 100644
--- a/src/components/DetailPage/DetailBlock.vue
+++ b/src/components/DetailPage/DetailBlock.vue
@@ -4,6 +4,9 @@
     type: String,
     required: true,
   },
+  needTitle: {
+    type: Boolean,
+  },
 })
 
 const slots = useSlots()
@@ -11,7 +14,7 @@
 
 <template>
   <div class="detail-main">
-    <div class="header">
+    <div v-if="needTitle" class="header">
       <div class="title">
         {{ title }}
       </div>
diff --git a/src/router/modules/basic.ts b/src/router/modules/basic.ts
index c4ded6f..66fb204 100644
--- a/src/router/modules/basic.ts
+++ b/src/router/modules/basic.ts
@@ -6,46 +6,69 @@
   {
     path: '/basic',
     component: Layout,
-    redirect: '/basic/deviceList',
-    name: 'DeviceList',
+    redirect: '/group/list',
+    name: 'Device',
     meta: {
       title: '设备管理',
       icon: 'ep:key',
-      auth: '/device/list',
+      auth: '/basic/device',
     },
     children: [
       {
-        path: '/basic/device',
+        path: 'group/list',
+        name: 'GroupList',
+        component: () => import('@/views/basic/group/list.vue'),
+        meta: {
+          title: '分组管理',
+          auth: '/basic/group/list',
+          icon: 'ep:key',
+        },
+      },
+      {
+        path: 'group/list/detail',
+        name: 'GroupInfoDetail',
+        component: () => import('@/views/basic/group/detail.vue'),
+        meta: {
+          title: '分组详情',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/basic/group/list',
+        },
+      },
+      {
+        path: 'device/list',
         name: 'DeviceList',
         component: () => import('@/views/basic/device/list.vue'),
         meta: {
-          title: '设备列表',
-          auth: '/device/list',
+          title: '设备管理',
+          auth: '/basic/device/list',
           icon: 'ep:key',
         },
       },
       {
-        path: ':type/:id?',
-        name: 'EquipmentInfoBookDetail',
-        component: () => import('@/views/equipement/info/book/detail.vue'),
+        path: 'device/list/detail',
+        name: 'DeviceInfoDetail',
+        component: () => import('@/views/basic/device/detail.vue'),
         meta: {
-          title: '设备台账管理',
-          icon: 'ep:key',
+          title: '设备详情',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/equipmentInfo/bookList',
+          activeMenu: '/basic/device/list',
         },
       },
-      {
-        path: 'tableList',
-        name: 'EquipmentInfoTableList',
-        component: () => import('@/views/equipement/info/table/list.vue'),
-        meta: {
-          title: '参照标准、工作标准和关键测量设备表列表',
-          auth: '/equipment/info/table',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: ':type/:id?',
+      //   name: 'EquipmentInfoBookDetail',
+      //   component: () => import('@/views/equipement/info/book/detail.vue'),
+      //   meta: {
+      //     title: '设备台账管理',
+      //     icon: 'ep:key',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/equipmentInfo/bookList',
+      //   },
+      // },
+
       // {
       //   path: ':type/:id?',
       //   name: 'EquipmentInfoTableDetail',
@@ -83,23 +106,23 @@
     ],
   },
   {
-    path: '/stateMaintenance',
+    path: '/product',
     component: Layout,
-    redirect: '/stateMaintenance/unseal',
+    redirect: '/basic/product',
     name: 'StateMaintenance',
     meta: {
-      title: '设备状态维护',
+      title: '产品管理',
       icon: 'ep:key',
-      auth: '/equipment/stateMaintenance',
+      auth: '/basic/product',
     },
     children: [
       {
-        path: 'unsealList',
-        name: 'UnsealList',
+        path: '/product/list',
+        name: 'ProductList',
         component: () => import('@/views/equipement/stateMaintenance/unseal/list.vue'),
         meta: {
-          title: '设备启封申请',
-          auth: '/equipment/stateMaintenance/unseal',
+          title: '产品管理',
+          auth: '/product/list',
           icon: 'ep:key',
         },
       },
@@ -128,12 +151,12 @@
         },
       },
       {
-        path: 'sealList',
-        name: 'SealList',
+        path: '/product/ota',
+        name: 'ProductOTA',
         component: () => import('@/views/equipement/stateMaintenance/seal/list.vue'),
         meta: {
-          title: '设备封存申请',
-          auth: '/equipment/stateMaintenance/seal',
+          title: '远程升级',
+          auth: '/product/ota',
           icon: 'ep:key',
         },
       },
diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts
index 971890d..671affc 100644
--- a/src/router/modules/system.ts
+++ b/src/router/modules/system.ts
@@ -6,7 +6,7 @@
   {
     path: '/area',
     component: Layout,
-    redirect: '/resource/list',
+    redirect: '/area/list',
     name: 'AreaManage',
     meta: {
       title: '区域管理',
@@ -154,94 +154,6 @@
     ],
   },
   {
-    path: '/process',
-    component: Layout,
-    redirect: '/process/list',
-    name: 'Process',
-    meta: {
-      title: '流程管理',
-      icon: 'ep:key',
-      auth: '/sys/process',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'ProcessList',
-        component: () => import('@/views/system/process/process.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process',
-        },
-      },
-      {
-        path: 'edit',
-        name: 'ProcessListEdit',
-        component: () => import('@/views/system/process/editProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          auth: '/sys/process',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'detail',
-        name: 'ProcessListDetail',
-        component: () => import('@/views/system/process/detailProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-      {
-        path: 'add',
-        name: 'ProcessListAdd',
-        component: () => import('@/views/system/process/addProcess.vue'),
-        meta: {
-          title: '流程管理',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/process/list',
-        },
-      },
-    ],
-  },
-  {
-    path: '/tenant',
-    component: Layout,
-    redirect: '/tenant/list',
-    name: 'TenantManage',
-    meta: {
-      title: '项目管理',
-      icon: 'ep:key',
-      auth: '/sys/tenantSys/list',
-    },
-    children: [
-      {
-        path: 'list',
-        name: 'TenantList',
-        component: () => import('@/views/system/tenant/list.tenant.vue'),
-        meta: {
-          title: '项目管理',
-          auth: '/sys/tenantSys/list',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/tenant',
-        },
-      },
-    ],
-  },
-  {
     path: '/businessLog',
     component: Layout,
     redirect: '/businessLog/list',
diff --git a/src/views/basic/common-interface.ts b/src/views/basic/common-interface.ts
new file mode 100644
index 0000000..714fb31
--- /dev/null
+++ b/src/views/basic/common-interface.ts
@@ -0,0 +1,6 @@
+// 字典值
+export interface IDictType {
+  name: string
+  id: string
+  value: string
+}
diff --git a/src/views/basic/device/detail.vue b/src/views/basic/device/detail.vue
new file mode 100644
index 0000000..e43ca3c
--- /dev/null
+++ b/src/views/basic/device/detail.vue
@@ -0,0 +1,233 @@
+<!-- 设备详情 -->
+<script name="DeviceInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo } from './device-info'
+import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const radioItems = ref([
+  { name: '数据查询', value: 'device-data' },
+  { name: '下发配置', value: 'device-config' },
+  { name: '耗电分析', value: 'device-cell' },
+])
+const current = ref('')
+const currentLabel = ref('')
+
+const basicFormRef = ref()
+
+const deviceInfo = ref<IDeviceInfo>({
+  id: '',
+  devcode: '',
+  deviceName: '',
+  deviceType: '',
+  deviceTypeName: '',
+  status: '',
+  statusName: '',
+  cell: '',
+  imei: '',
+  iccid: '',
+  model: '',
+  modelName: '',
+  productId: '',
+  productName: '',
+  encipherType: '',
+  encipherTypeName: '',
+  createTime: '',
+  createUserName: '',
+  dataValue: '',
+})
+
+// 逻辑
+const resetForm = () => {
+  router.go(-1)
+}
+
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  deviceInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateDevice(deviceInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '设备详情（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 查询详情
+const detailById = (id: string) => {
+  detailDevice({ id }).then((res) => {
+    if (res.code === 200) {
+      deviceInfo.value = res.data
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  switch (params.type) {
+    case 'detail':
+      title.value = '设备详情'
+      id.value = params.id
+
+      detailById(id.value)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="deviceInfo" label-position="right" label-width="110px" stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="设备编号：">
+              {{ deviceInfo.devcode }}
+            </el-form-item>
+            <el-form-item label="设备IMEI：">
+              {{ deviceInfo.imei }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="所属产品：">
+              {{ deviceInfo.productName }}
+            </el-form-item>
+
+            <el-form-item label="ICCID：">
+              {{ deviceInfo.iccid }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="设备类型：">
+              {{ deviceInfo.deviceTypeName }}
+            </el-form-item>
+
+            <el-form-item label="加密方式：">
+              {{ deviceInfo.encipherTypeName }}
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="设备型号：">
+              {{ deviceInfo.modelName }}
+            </el-form-item>
+
+            <el-form-item label="创建时间：">
+              {{ deviceInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-radio-group v-model="currentLabel" style="margin: 20px;" @change="radioChangeHandler">
+        <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+      </el-radio-group>
+
+      <template v-if="current === 'device-data'" />
+
+      <template v-if="current === 'device-config'" />
+
+      <template v-if="current === 'device-cell'">
+        <detail-block :need-title="false" title="">
+          敬请期待
+        </detail-block>
+      </template>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
new file mode 100644
index 0000000..7a1c228
--- /dev/null
+++ b/src/views/basic/device/device-info.ts
@@ -0,0 +1,37 @@
+// 列表查询参数接口
+export interface IListQuery {
+  groupId: string // 分组
+  productId: string
+  devcode: string
+  imei: string
+  deviceType: string
+  status: string
+  beginCell: string // 电量
+  endCell: string //
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
+
+export interface IDeviceInfo {
+  id: string
+  devcode: string
+  deviceName: string
+  deviceType: string
+  deviceTypeName: string
+  status: string
+  statusName: string
+  cell: string
+  imei: string
+  iccid: string
+  model: string
+  modelName: string
+  productId: string
+  productName: string
+  encipherType: string
+  encipherTypeName: string
+  createTime: string
+  createUserName: string
+  dataValue: string
+}
diff --git a/src/views/basic/device/list.vue b/src/views/basic/device/list.vue
new file mode 100644
index 0000000..ba00120
--- /dev/null
+++ b/src/views/basic/device/list.vue
@@ -0,0 +1,314 @@
+<!-- 设备列表 -->
+<script name="DeviceList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from '../group/group-info'
+import type { IDictType } from '../common-interface'
+import type { IDeviceInfo, IListQuery } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { getGroupListPage } from '@/api/basic/group'
+import { delDevice, exportDevice, getDeviceListPage } from '@/api/basic/device'
+
+const router = useRouter()
+
+// 分组列表
+const groupList = ref<Array<IGroupInfo>>([])
+
+const cell = ref<string>('')
+const cellLevelList = [
+  { value: 1, name: '低于10%' },
+  { value: 2, name: '低于20%' },
+  { value: 3, name: '低于30%' },
+  { value: 4, name: '低于50%' },
+]
+
+// 查询条件
+const searchQuery = ref<IListQuery>({
+  groupId: '', // 分组
+  productId: '',
+  devcode: '',
+  imei: '',
+  deviceType: '',
+  status: '',
+  beginCell: '0', // 电量
+  endCell: '', //
+  offset: 1,
+  limit: 20,
+})
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '状态', value: 'status', align: 'center', width: '60' },
+  { text: '设备编号', value: 'devcode', align: 'center', width: '160' },
+  { text: 'IMEI', value: 'imei', align: 'center', width: '160' },
+  { text: '所属产品', value: 'productName', align: 'center', width: '160' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center', width: '200' },
+  { text: '设备型号', value: 'modelName', align: 'center', width: '200' },
+  { text: '电量（%）', value: 'cell', align: 'center', width: '100' },
+  { text: '最新数据', value: 'dataValue', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '最新上线时间', value: 'logtime', align: 'center', width: '180' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const statusDict = ref<Array<IDictType>>([])
+const deviceTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+
+// 跳转到新建的页面
+const exportAllDevice = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (dataList.value.length > 0) {
+    const exportQuery = searchQuery.value
+    delete exportQuery.limit
+    delete exportQuery.offset
+
+    // 导出接口
+    exportDevice(exportQuery).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备列表.xlsx')
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  // 关闭loading
+  loading.close()
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 编辑
+const updateById = (row: IDeviceInfo) => {
+  sessionStorage.setItem('sealInfo', JSON.stringify(row))
+  router.push({
+    query: {
+      type: 'update',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+        }
+      })
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+const searchList = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 重置
+const reset = () => {
+  searchQuery.value = {
+    groupId: '', // 分组
+    productId: '',
+    devcode: '',
+    imei: '',
+    deviceType: '',
+    status: '',
+    beginCell: '0', // 电量
+    endCell: '', //
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 删除
+const deleteById = (row: IDeviceInfo) => {
+  ElMessageBox.confirm(`是否删除设备 ${row.devcode}`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delDevice(row.id).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`设备 ${row.devcode} 删除成功`)
+        searchList()
+      }
+      else {
+        ElMessage.error(`设备 ${row.devcode} 删除失败: ${res.message}`)
+      }
+    })
+  })
+}
+
+// 获取在用状态字典值
+const getStatusDict = async () => {
+  getDictByCode('onlineStatus').then((res: any) => {
+    if (res.code === 200) {
+      statusDict.value = res.data
+      sessionStorage.setItem('onlineStatus', JSON.stringify(statusDict.value))
+    }
+  })
+}
+const getDeviceTypeDict = async () => {
+  getDictByCode('deviceType').then((res: any) => {
+    if (res.code === 200) {
+      deviceTypeDict.value = res.data
+      sessionStorage.setItem('deviceType', JSON.stringify(deviceTypeDict.value))
+    }
+  })
+}
+const getAllGroupList = async () => {
+  await getGroupListPage({ offset: 1, limit: 20 }).then((res: any) => {
+    if (res.code === 200) {
+      groupList.value = res.data.rows
+    }
+  })
+}
+const getDict = async () => {
+  await getStatusDict()
+  await getDeviceTypeDict()
+  await getAllGroupList()
+}
+
+watch(() => cell.value, (val) => {
+  switch (val) {
+    case '1':
+      searchQuery.value.endCell = '10'
+      break
+
+    case '2':
+      searchQuery.value.endCell = '20'
+      break
+
+    case '3':
+      searchQuery.value.endCell = '30'
+      break
+
+    case '4':
+      searchQuery.value.endCell = '40'
+      break
+
+    default:
+      searchQuery.value.endCell = '100'
+      break
+  }
+})
+
+onMounted(async () => {
+  await getDict()
+  searchList()
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-select v-model="searchQuery.groupId" placeholder="请选择分组" clearable filterable>
+          <el-option v-for="group in groupList" :key="group.id" :label="group.groupName" :value="group.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.devcode" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.imei" placeholder="设备IMEI号" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.deviceType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.status" placeholder="设备状态" clearable>
+          <el-option v-for="item in statusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-select v-model="cell" placeholder="设备电量" clearable>
+          <el-option v-for="item in cellLevelList" :key="item.value" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container title="设备列表">
+      <!-- 表头区域 -->
+      <template #btns-right>
+        <el-button type="primary" @click="exportDevice">
+          批量下发配置
+        </el-button>
+        <el-button type="primary" @click="exportAllDevice">
+          导出列表
+        </el-button>
+      </template>
+
+      <!-- 表格区域 -->
+      <normal-table
+        :data="dataList" :columns="columns" :total="total"
+        :query="searchQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset! - 1) * searchQuery.limit! + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="130">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
diff --git a/src/views/basic/group/addDialog.vue b/src/views/basic/group/addDialog.vue
new file mode 100644
index 0000000..d1f3405
--- /dev/null
+++ b/src/views/basic/group/addDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->
+<script name="AddGroupDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from './group-info'
+import { addGroup, updateGroup } from '@/api/basic/group'
+
+const emit = defineEmits(['recordSaved'])
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const title = ref('')
+
+const infoFormRef = ref()
+
+const groupInfo = ref<IGroupInfo>({
+  id: '',
+  groupName: '',
+  deptid: '',
+  deptName: '',
+  descn: '',
+  createUserId: '',
+  createTime: '',
+})
+
+const groupInfoRules = ref({
+  groupName: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }],
+  deptid: [{ required: true, message: '所属组织不能为空，请选择', trigger: ['blur', 'change'] }],
+  descn: [{ required: true, message: '分组描述不能为空', trigger: 'blur' }],
+}) // 表单验证规则
+
+const showDialog = ref<boolean>(false)
+
+// 逻辑
+const resetForm = () => {
+  sessionStorage.removeItem('groupInfo') // 返回列表时 将缓存中的数据删除
+
+  groupInfo.value = {
+    id: '',
+    groupName: '',
+    deptid: '',
+    deptName: '',
+    descn: '',
+    createUserId: '',
+    createTime: '',
+  }
+
+  infoFormRef.value.clearValidate()
+  showDialog.value = false
+}
+
+// 添加
+const saveInfo = () => {
+  // 将创建时间改为提交的时间
+  groupInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateInfoById = () => {
+  updateGroup(groupInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+
+      resetForm()
+      emit('recordSaved')
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!infoFormRef) { return }
+
+  await infoFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveInfo()
+        }
+        else if (type.value === 'update') {
+          updateInfoById()
+        }
+      })
+    }
+  })
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '新增分组'
+
+      break
+    case 'update':
+      title.value = '编辑分组'
+      groupInfo.value = JSON.parse(sessionStorage.getItem('groupInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+
+  showDialog.value = true
+}
+
+defineExpose({
+  initDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showDialog" :title="title" :append-to-body="true" :close-on-click-modal="false">
+    <detail-block title="">
+      <el-form ref="infoFormRef" :model="groupInfo" :rules="groupInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row v-if="type === 'update'" :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组编号">
+              <el-input v-model="groupInfo.groupNo" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组名称" prop="groupName">
+              <el-input v-model="groupInfo.groupName" placeholder="请输入分组名称" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="所属组织" prop="deptid">
+              <dept-select v-model="groupInfo.deptid" placeholder="请选择所属组织" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="18" :offset="3">
+            <el-form-item label="分组描述" prop="descn">
+              <el-input v-model="groupInfo.descn" placeholder="请输入分组描述" type="textarea" :rows="3" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="resetForm">取消</el-button>
+        <el-button type="primary" @click="saveForm">
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/basic/group/detail.vue b/src/views/basic/group/detail.vue
new file mode 100644
index 0000000..d88ad97
--- /dev/null
+++ b/src/views/basic/group/detail.vue
@@ -0,0 +1,390 @@
+<!-- 分组详情 -->
+<script name="GroupInfoDetail" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IGroupInfo } from './group-info'
+import { detailGroup } from '@/api/basic/group'
+
+// 从路由中传过来的参数
+const type = ref<string>('')
+const id = ref<string>('')
+
+const route = useRoute()
+const router = useRouter()
+const title = ref('')
+
+const basicFormRef = ref()
+const refFilterDialog = ref()
+
+const sealInfo = ref<IGroupInfo>({
+  id: '',
+  sealNo: '',
+  sealName: '',
+  sealType: '',
+  sealTypeName: '',
+  status: '',
+  statusName: '',
+  applyTime: '',
+  abandonTime: '',
+  ratifyTime: '',
+  createTime: '',
+  approverId: '',
+  approverName: '',
+  minioFileName: '',
+  minioFileUrl: '',
+})
+
+const sealInfoRules = ref({
+  sealNo: [{ required: true, message: '印章编号不能为空', trigger: 'blur' }],
+  sealName: [{ required: true, message: '印章名称不能为空', trigger: 'blur' }],
+  sealType: [{ required: true, message: '印章类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  approverId: [{ required: true, message: '批准人不能为空', trigger: ['blur', 'change'] }],
+  applyTime: [{ required: true, message: '申请时间不能为空，请选择', trigger: 'blur' }],
+  ratifyTime: [{ required: true, message: '批准时间不能为空，请选择', trigger: 'blur' }],
+  status: [{ required: true, message: '在用状态不能为空，请选择', trigger: ['blur', 'change'] }],
+  minioFileName: [{ required: true, message: '图形不能为空，请选择一个文件上传', trigger: 'blur' }],
+}) // 表单验证规则
+
+const minioFileUrl = ref<string>('')
+
+// 逻辑
+
+const resetForm = () => {
+  sessionStorage.removeItem('sealInfo') // 返回列表时 将缓存中的数据删除
+  router.go(-1)
+}
+
+// 添加
+const saveSealInfoForm = () => {
+  // 将创建时间改为提交的时间
+  sealInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addSealInfo(sealInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '印章管理登记（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+// 编辑
+const updateSealInfoById = () => {
+  updateSealInfo(sealInfo.value).then((res) => {
+    if (res.code === 200) {
+      // 提示保存成功
+      ElMessage.success('保存成功')
+      type.value = 'detail'
+      title.value = '印章管理登记（详情）'
+    }
+    else {
+      // 提示失败信息
+      ElMessage.error(`保存失败：${res.message}`)
+    }
+  })
+}
+
+// 保存
+const saveForm = async () => {
+  if (!basicFormRef) { return }
+
+  await basicFormRef.value.validate((valid: boolean, fields: any) => {
+    if (valid === true) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (type.value === 'create') {
+          saveSealInfoForm()
+        }
+        else if (type.value === 'update') {
+          updateSealInfoById()
+        }
+      })
+    }
+  })
+}
+
+// 上传请求
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('上传成功')
+      sealInfo.value.minioFileName = res.data[0]
+      loading.close()
+
+      basicFormRef.value.validateField('minioFileName', () => {})
+    }
+  }).catch(() => {
+    loading.close()
+    ElMessage.error('上传失败')
+  })
+}
+
+// 上传之前的验证
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/jpg') {
+    ElMessage.error('只能上传png/jpeg/jpg格式的图片')
+    return false
+  }
+  else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片不能大于2MB')
+    return false
+  }
+  return true
+}
+
+// 预览文件
+const previewSealImage = (url: string) => {
+  console.log(url)
+}
+
+// 从用户账号中筛选进行人员登记
+const showFilterSysUser = () => {
+  refFilterDialog.value.showOrHideFilterDialog(true)
+}
+
+const recordSelectedHandler = (row: any) => {
+  refFilterDialog.value.showOrHideFilterDialog(false)
+  sealInfo.value.approverName = row.name
+  sealInfo.value.approverId = row.id
+}
+
+const initDialog = (params: any) => {
+  // 从路由中获取参数
+  type.value = params.type
+  id.value = params.id !== undefined ? params.id : ''
+
+  switch (params.type) {
+    case 'create' :
+      title.value = '印章管理登记（新增）'
+
+      // 创建时间设置默认值
+      sealInfo.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+
+      break
+    case 'update':
+      title.value = '印章管理登记（编辑）'
+      id.value = params.id
+
+      sealInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+
+      break
+    case 'detail':
+      title.value = '印章管理登记（详情）'
+      id.value = params.id
+
+      sealInfo.value = JSON.parse(sessionStorage.getItem('sealInfo')!)
+
+      break
+    default:
+      title.value = ''
+      break
+  }
+}
+
+// 监听 显示中文 立即监听
+watch(() => sealInfo.value.sealType, (newVal) => {
+  if (sealTypeDict.value.length === 0) {
+    sealTypeDict.value = JSON.parse(sessionStorage.getItem('bizSealType')!)
+  }
+  const targetList = sealTypeDict.value.filter(item => item.value === newVal)
+  if (targetList.length > 0) {
+    sealInfo.value.sealTypeName = targetList[0].name
+  }
+  else {
+    sealInfo.value.sealTypeName = ''
+  }
+}, { immediate: true })
+
+// 监听 显示中文 立即监听
+watch(() => sealInfo.value.status, (newVal) => {
+  if (sealStatusDict.value.length === 0) {
+    sealStatusDict.value = JSON.parse(sessionStorage.getItem('bizSealStatus')!)
+  }
+  const targetList = sealStatusDict.value.filter(item => item.value === newVal)
+  if (targetList.length > 0) {
+    sealInfo.value.statusName = targetList[0].name
+  }
+  else {
+    sealInfo.value.statusName = ''
+  }
+}, { immediate: true })
+
+watch(() => sealInfo.value.minioFileName, (newVal) => {
+  if (newVal !== '') {
+    getPhotoUrl(newVal).then((res) => {
+      if (res.code === 200) {
+        minioFileUrl.value = res.data
+      }
+    })
+  }
+})
+
+onMounted(async () => {
+  initDialog(route.query)
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`${title}`">
+      <template #btns>
+        <el-button v-if="type !== 'detail'" type="primary" @click="saveForm()">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm()">
+          关闭
+        </el-button>
+      </template>
+
+      <el-form ref="basicFormRef" :model="sealInfo" :rules="sealInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row :gutter="24">
+          <!-- 第一行 第一列 -->
+          <el-col :span="6">
+            <el-form-item label="印章编号" prop="sealNo">
+              <el-input v-model="sealInfo.sealNo" placeholder="请输入印章编号" tabindex="1" :clearable="true" :disabled="type === 'detail'" />
+            </el-form-item>
+
+            <el-form-item label="申请时间" prop="applyTime">
+              <el-date-picker
+                v-model="sealInfo.applyTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择申请时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="5"
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第二列 -->
+          <el-col :span="6">
+            <el-form-item label="印章名称" prop="sealName">
+              <el-input v-model="sealInfo.sealName" :clearable="true" placeholder="请输入印章名称" tabindex="2" :disabled="type === 'detail'" />
+            </el-form-item>
+
+            <el-form-item label="批准时间" prop="ratifyTime">
+              <el-date-picker
+                v-model="sealInfo.ratifyTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择批准时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="6"
+              />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第三列 -->
+          <el-col :span="6">
+            <el-form-item label="印章类型" prop="sealType">
+              <el-select v-model="sealInfo.sealType" placeholder="请选择印章类型" tabindex="3" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in sealTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+              <el-input v-model="sealInfo.sealTypeName" type="hidden" />
+            </el-form-item>
+
+            <el-form-item label="在用状态" prop="status">
+              <el-select v-model="sealInfo.status" placeholder="请选择是否在用" tabindex="7" style="width: 100%;" :clearable="true" :disabled="type === 'detail'">
+                <el-option v-for="dict in sealStatusDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+              <el-input v-model="sealInfo.statusName" type="hidden" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 第一行 第四列 -->
+          <el-col :span="6">
+            <el-form-item label="批准人" prop="approverId">
+              <el-input v-model="sealInfo.approverName" :clearable="true" :readonly="true" placeholder="请选择批准人" tabindex="4" :disabled="type === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="type === 'detail'" @click="showFilterSysUser">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+              <el-input v-model="sealInfo.approverId" type="hidden" />
+            </el-form-item>
+
+            <el-form-item label="报废时间">
+              <el-date-picker
+                v-model="sealInfo.abandonTime" type="date"
+                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="请选择批准时间" :disabled="type === 'detail'" style="width: 100%;"
+                tabindex="8"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- 第四行 -->
+        <el-row :gutter="24">
+          <el-col :span="20">
+            <el-form-item label="图形" prop="minioFileName">
+              <el-input v-model="sealInfo.minioFileName" type="hidden" />
+
+              <el-upload
+                class="avatar-uploader"
+                :show-file-list="false"
+                :http-request="uploadQuarterlyEvaluateFile"
+                :before-upload="beforeAvatarUpload"
+                accept="image/png, image/jpeg,image/jpg"
+                style="width: 50%; margin-left: 20px;"
+                :disabled="type === 'detail'"
+                tabindex="9"
+              >
+                <el-image v-if="sealInfo.minioFileName" :src="minioFileUrl" class="avatar" fit="contain" @click="previewSealImage" />
+                <el-icon v-else class="avatar-uploader-icon">
+                  <plus />
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+
+    <filter-sys-user ref="refFilterDialog" @record-selected="recordSelectedHandler" />
+  </app-container>
+</template>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 190px;
+  height: 250px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 190px;
+  height: 250px;
+  text-align: center;
+}
+</style>
+./group-info
diff --git a/src/views/basic/group/group-info.ts b/src/views/basic/group/group-info.ts
new file mode 100644
index 0000000..00bbef6
--- /dev/null
+++ b/src/views/basic/group/group-info.ts
@@ -0,0 +1,23 @@
+// 列表查询参数接口
+export interface IListQuery {
+  ids?: [] // id列表 导出用
+  groupNo?: string
+  groupName: string // 分组名
+  beginTime: string // 创建时间-开始
+  endTime: string // 创建时间-结束
+  offset: number
+  limit: number
+  sort?: string
+  order?: string
+}
+
+export interface IGroupInfo {
+  id: string // id
+  groupNo?: string // 分组编号
+  groupName: string // 分组名称
+  deptid: string // 所属组织
+  deptName: string // 所属组织名称
+  descn: string // 分组描述
+  createUserId: string
+  createTime?: string
+}
diff --git a/src/views/basic/group/list.vue b/src/views/basic/group/list.vue
new file mode 100644
index 0000000..2af82fb
--- /dev/null
+++ b/src/views/basic/group/list.vue
@@ -0,0 +1,214 @@
+<!-- 分组管理 列表 -->
+<script name="GroupList" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IGroupInfo, IListQuery } from './group-info'
+import AddGroupDialog from './addDialog.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { delGroup, getGroupListPage } from '@/api/basic/group'
+import { getDictByCode } from '@/api/system/dict'
+
+const { proxy } = getCurrentInstance() as any
+const router = useRouter()
+
+const refAddGroupDialog = ref()
+
+// 查询条件
+const searchQuery = ref<IListQuery>({
+  groupName: '', // 分组名
+  beginTime: '', // 创建时间-起始
+  endTime: '', // 创建时间-结束
+  offset: 1,
+  limit: 20,
+})
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '分组编号', value: 'groupNo', align: 'center', width: '160' },
+  { text: '分组名称', value: 'groupName', align: 'center' },
+  { text: '所属组织', value: 'deptName', align: 'center', width: '320' },
+  { text: '设备数量', value: 'deviceCount', align: 'center', width: '160' },
+  { text: '订阅数量', value: 'subscribeCount', align: 'center', width: '160' },
+  { text: '分组创建时间', value: 'createTime', align: 'center', width: '180' },
+])
+const dataList = ref<Array<IGroupInfo>>([]) // 表格数据
+
+// 逻辑
+
+// 跳转到新建的页面
+const addDeviceGroup = () => {
+  refAddGroupDialog.value.initDialog({ type: 'create' })
+}
+
+// 详情
+const detail = (row: IGroupInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'list/detail',
+  })
+}
+
+// 编辑
+const updateById = (row: IGroupInfo) => {
+  sessionStorage.setItem('groupInfo', JSON.stringify(row))
+  refAddGroupDialog.value.initDialog({ type: 'update', id: row.id })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getGroupListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows
+      total.value = parseInt(response.data.total)
+    }
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
+}
+
+const searchList = () => {
+  fetchData(true)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 重置
+const reset = () => {
+  searchQuery.value = {
+    groupName: '', // 分组名
+    beginTime: '', // 创建时间-起始
+    endTime: '', // 创建时间-结束
+    offset: 1,
+    limit: 20,
+  }
+  fetchData(true)
+}
+
+// 删除
+const deleteById = (row: IGroupInfo) => {
+  ElMessageBox.confirm(`是否删除分组 ${row.groupName}`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    delGroup(row.id!).then((res) => {
+      if (res.code === 200) {
+        ElMessage.success(`分组 ${row.groupName} 删除成功`)
+        fetchData(true)
+      }
+      else {
+        ElMessage.error(`分组 ${row.groupName} 删除失败: ${res.message}`)
+      }
+    })
+  })
+}
+
+const groupSavedHandler = () => {
+  fetchData(true)
+}
+
+// 获取在用状态字典值
+const getDeviceTypeDict = () => {
+  getDictByCode('deviceType').then((res: any) => {
+    if (res.code === 200) {
+      sessionStorage.setItem('deviceType', JSON.stringify(res.data))
+    }
+  })
+}
+const getDict = async () => {
+  getDeviceTypeDict()
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.beginTime = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    searchQuery.value.endTime = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    searchQuery.value.beginTime = ''
+    searchQuery.value.endTime = ''
+  }
+})
+
+onMounted(async () => {
+  await getDict()
+  searchList()
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="searchList" @clear="reset">
+      <search-item>
+        <el-input v-model="searchQuery.groupName" placeholder="分组名称" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container title="分组管理">
+      <!-- 表头区域 -->
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm(`/basic/group/add`)" icon="icon-add" title="新建" @click="addDeviceGroup" />
+      </template>
+
+      <!-- 表格区域 -->
+      <normal-table
+        :data="dataList" :total="total" :columns="columns"
+        :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
+        :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column fixed="right" label="操作" align="center" width="180">
+            <template #default="{ row }">
+              <el-button size="small" type="primary" link @click="detail(row)">
+                查看
+              </el-button>
+              <el-button v-if="proxy.hasPerm(`/basic/group/edit`)" size="small" type="primary" link @click="updateById(row)">
+                编辑
+              </el-button>
+
+              <el-button v-if="proxy.hasPerm(`/basic/group/del`)" size="small" type="danger" link @click="deleteById(row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <add-group-dialog ref="refAddGroupDialog" @record-saved="groupSavedHandler" />
+  </app-container>
+</template>