diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 9db63f4..e0ff66e 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -37,3 +37,15 @@
   createUserName?: string
   dataValue?: string
 }
+
+export interface IConfigListQuery {
+  devcode: string // 设备编号
+  configType: string // 配置类型
+  status: string // 配置状态
+  beginTime: string // 操作时间-开始
+  endTime: string // 操作时间-结束
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 9db63f4..e0ff66e 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -37,3 +37,15 @@
   createUserName?: string
   dataValue?: string
 }
+
+export interface IConfigListQuery {
+  devcode: string // 设备编号
+  configType: string // 配置类型
+  status: string // 配置状态
+  beginTime: string // 操作时间-开始
+  endTime: string // 操作时间-结束
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
diff --git a/src/views/basic/product/addGroupDialog.vue b/src/views/basic/product/addGroupDialog.vue
deleted file mode 100644
index d1f3405..0000000
--- a/src/views/basic/product/addGroupDialog.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- 添加 / 编辑 -->
-<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/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 9db63f4..e0ff66e 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -37,3 +37,15 @@
   createUserName?: string
   dataValue?: string
 }
+
+export interface IConfigListQuery {
+  devcode: string // 设备编号
+  configType: string // 配置类型
+  status: string // 配置状态
+  beginTime: string // 操作时间-开始
+  endTime: string // 操作时间-结束
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
diff --git a/src/views/basic/product/addGroupDialog.vue b/src/views/basic/product/addGroupDialog.vue
deleted file mode 100644
index d1f3405..0000000
--- a/src/views/basic/product/addGroupDialog.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- 添加 / 编辑 -->
-<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/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
new file mode 100644
index 0000000..6e7fb6f
--- /dev/null
+++ b/src/views/basic/product/addProductDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->group
+<script name="AddProductDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IProductInfo } from './product-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<IProductInfo>({
+  id: '',
+  productName: '',
+  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: '',
+    productName: '',
+    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.productNo" :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.productName" 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/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 9db63f4..e0ff66e 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -37,3 +37,15 @@
   createUserName?: string
   dataValue?: string
 }
+
+export interface IConfigListQuery {
+  devcode: string // 设备编号
+  configType: string // 配置类型
+  status: string // 配置状态
+  beginTime: string // 操作时间-开始
+  endTime: string // 操作时间-结束
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
diff --git a/src/views/basic/product/addGroupDialog.vue b/src/views/basic/product/addGroupDialog.vue
deleted file mode 100644
index d1f3405..0000000
--- a/src/views/basic/product/addGroupDialog.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- 添加 / 编辑 -->
-<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/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
new file mode 100644
index 0000000..6e7fb6f
--- /dev/null
+++ b/src/views/basic/product/addProductDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->group
+<script name="AddProductDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IProductInfo } from './product-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<IProductInfo>({
+  id: '',
+  productName: '',
+  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: '',
+    productName: '',
+    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.productNo" :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.productName" 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/product/group-info.ts b/src/views/basic/product/group-info.ts
deleted file mode 100644
index 00bbef6..0000000
--- a/src/views/basic/product/group-info.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// 列表查询参数接口
-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/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 9db63f4..e0ff66e 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -37,3 +37,15 @@
   createUserName?: string
   dataValue?: string
 }
+
+export interface IConfigListQuery {
+  devcode: string // 设备编号
+  configType: string // 配置类型
+  status: string // 配置状态
+  beginTime: string // 操作时间-开始
+  endTime: string // 操作时间-结束
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
diff --git a/src/views/basic/product/addGroupDialog.vue b/src/views/basic/product/addGroupDialog.vue
deleted file mode 100644
index d1f3405..0000000
--- a/src/views/basic/product/addGroupDialog.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- 添加 / 编辑 -->
-<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/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
new file mode 100644
index 0000000..6e7fb6f
--- /dev/null
+++ b/src/views/basic/product/addProductDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->group
+<script name="AddProductDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IProductInfo } from './product-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<IProductInfo>({
+  id: '',
+  productName: '',
+  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: '',
+    productName: '',
+    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.productNo" :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.productName" 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/product/group-info.ts b/src/views/basic/product/group-info.ts
deleted file mode 100644
index 00bbef6..0000000
--- a/src/views/basic/product/group-info.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// 列表查询参数接口
-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/product/list.vue b/src/views/basic/product/list.vue
index 4b0fceb..6e3140a 100644
--- a/src/views/basic/product/list.vue
+++ b/src/views/basic/product/list.vue
@@ -1,21 +1,21 @@
-<!-- 分组管理 列表 -->
-<script name="GroupList" lang="ts" setup>
+<!-- 产品管理 列表 -->
+<script name="ProductList" 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 './addGroupDialog.vue'
+import type { IListQuery, IProductInfo } from './product-info'
+import AddProductDialog from './addProductDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { delGroup, getGroupListPage } from '@/api/basic/group'
+import { delProduct, getProductListPage } from '@/api/basic/product'
 import { getDictByCode } from '@/api/system/dict'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
-const refAddGroupDialog = ref()
+const refAddProductDialog = ref()
 
 // 查询条件
 const searchQuery = ref<IListQuery>({
-  groupName: '', // 分组名
+  productName: '', // 产品名
   beginTime: '', // 创建时间-起始
   endTime: '', // 创建时间-结束
   offset: 1,
@@ -27,24 +27,26 @@
 
 // 表头
 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' },
+  { text: '产品编号', value: 'productNo', align: 'center', width: '160' },
+  { text: '产品名称', value: 'name', align: 'center' },
+  { text: '产品类型', value: 'productTypeName', align: 'center', width: '320' },
+  { text: '设备型号', value: 'model', align: 'center', width: '160' },
+  { text: '数据加密方式', value: 'encipherTypeName', align: 'center', width: '160' },
+  { text: '接入方式', value: 'accessTypeName', align: 'center', width: '180' },
+  { text: '设备总数', value: 'createTime', align: 'center', width: '180' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
-const dataList = ref<Array<IGroupInfo>>([]) // 表格数据
+const dataList = ref<Array<IProductInfo>>([]) // 表格数据
 
 // 逻辑
 
 // 跳转到新建的页面
-const addDeviceGroup = () => {
-  refAddGroupDialog.value.initDialog({ type: 'create' })
+const addProduct = () => {
+  refAddProductDialog.value.initDialog({ type: 'create' })
 }
 
 // 详情
-const detail = (row: IGroupInfo) => {
+const detail = (row: IProductInfo) => {
   router.push({
     query: {
       type: 'detail',
@@ -55,9 +57,9 @@
 }
 
 // 编辑
-const updateById = (row: IGroupInfo) => {
+const updateById = (row: IProductInfo) => {
   sessionStorage.setItem('groupInfo', JSON.stringify(row))
-  refAddGroupDialog.value.initDialog({ type: 'update', id: row.id })
+  refAddProductDialog.value.initDialog({ type: 'update', id: row.id })
 }
 
 // 数据查询
@@ -67,7 +69,7 @@
     // 是否显示当前页，否则跳转第一页
     searchQuery.value.offset = 1
   }
-  getGroupListPage(searchQuery.value).then((response) => {
+  getProductListPage(searchQuery.value).then((response) => {
     if (response.code === 200) {
       dataList.value = response.data.rows
       total.value = parseInt(response.data.total)
@@ -96,7 +98,7 @@
 // 重置
 const reset = () => {
   searchQuery.value = {
-    groupName: '', // 分组名
+    productName: '', // 产品名
     beginTime: '', // 创建时间-起始
     endTime: '', // 创建时间-结束
     offset: 1,
@@ -106,25 +108,25 @@
 }
 
 // 删除
-const deleteById = (row: IGroupInfo) => {
-  ElMessageBox.confirm(`是否删除分组 ${row.groupName}`, '提示', {
+const deleteById = (row: IProductInfo) => {
+  ElMessageBox.confirm(`是否删除产品 ${row.productName}`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    delGroup(row.id!).then((res) => {
+    delProduct(row.id!).then((res) => {
       if (res.code === 200) {
-        ElMessage.success(`分组 ${row.groupName} 删除成功`)
+        ElMessage.success(`产品 ${row.productName} 删除成功`)
         fetchData(true)
       }
       else {
-        ElMessage.error(`分组 ${row.groupName} 删除失败: ${res.message}`)
+        ElMessage.error(`产品 ${row.productName} 删除失败: ${res.message}`)
       }
     })
   })
 }
 
-const groupSavedHandler = () => {
+const productSavedHandler = () => {
   fetchData(true)
 }
 
@@ -162,7 +164,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.groupName" placeholder="分组名称" clearable />
+        <el-input v-model="searchQuery.productName" placeholder="产品名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
@@ -170,10 +172,10 @@
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="分组管理">
+    <table-container title="产品管理">
       <!-- 表头区域 -->
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm(`/basic/group/add`)" icon="icon-add" title="新建" @click="addDeviceGroup" />
+        <icon-button v-if="proxy.hasPerm(`/basic/product/add`)" icon="icon-add" title="新建" @click="addProduct" />
       </template>
 
       <!-- 表格区域 -->
@@ -196,11 +198,11 @@
               <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 v-if="proxy.hasPerm(`/basic/product/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 v-if="proxy.hasPerm(`/basic/product/del`)" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
             </template>
@@ -209,6 +211,6 @@
       </normal-table>
     </table-container>
 
-    <add-group-dialog ref="refAddGroupDialog" @record-saved="groupSavedHandler" />
+    <add-product-dialog ref="refAddProductDialog" @record-saved="productSavedHandler" />
   </app-container>
 </template>

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 9db63f4..e0ff66e 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -37,3 +37,15 @@
   createUserName?: string
   dataValue?: string
 }
+
+export interface IConfigListQuery {
+  devcode: string // 设备编号
+  configType: string // 配置类型
+  status: string // 配置状态
+  beginTime: string // 操作时间-开始
+  endTime: string // 操作时间-结束
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
diff --git a/src/views/basic/product/addGroupDialog.vue b/src/views/basic/product/addGroupDialog.vue
deleted file mode 100644
index d1f3405..0000000
--- a/src/views/basic/product/addGroupDialog.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- 添加 / 编辑 -->
-<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/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
new file mode 100644
index 0000000..6e7fb6f
--- /dev/null
+++ b/src/views/basic/product/addProductDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->group
+<script name="AddProductDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IProductInfo } from './product-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<IProductInfo>({
+  id: '',
+  productName: '',
+  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: '',
+    productName: '',
+    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.productNo" :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.productName" 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/product/group-info.ts b/src/views/basic/product/group-info.ts
deleted file mode 100644
index 00bbef6..0000000
--- a/src/views/basic/product/group-info.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// 列表查询参数接口
-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/product/list.vue b/src/views/basic/product/list.vue
index 4b0fceb..6e3140a 100644
--- a/src/views/basic/product/list.vue
+++ b/src/views/basic/product/list.vue
@@ -1,21 +1,21 @@
-<!-- 分组管理 列表 -->
-<script name="GroupList" lang="ts" setup>
+<!-- 产品管理 列表 -->
+<script name="ProductList" 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 './addGroupDialog.vue'
+import type { IListQuery, IProductInfo } from './product-info'
+import AddProductDialog from './addProductDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { delGroup, getGroupListPage } from '@/api/basic/group'
+import { delProduct, getProductListPage } from '@/api/basic/product'
 import { getDictByCode } from '@/api/system/dict'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
-const refAddGroupDialog = ref()
+const refAddProductDialog = ref()
 
 // 查询条件
 const searchQuery = ref<IListQuery>({
-  groupName: '', // 分组名
+  productName: '', // 产品名
   beginTime: '', // 创建时间-起始
   endTime: '', // 创建时间-结束
   offset: 1,
@@ -27,24 +27,26 @@
 
 // 表头
 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' },
+  { text: '产品编号', value: 'productNo', align: 'center', width: '160' },
+  { text: '产品名称', value: 'name', align: 'center' },
+  { text: '产品类型', value: 'productTypeName', align: 'center', width: '320' },
+  { text: '设备型号', value: 'model', align: 'center', width: '160' },
+  { text: '数据加密方式', value: 'encipherTypeName', align: 'center', width: '160' },
+  { text: '接入方式', value: 'accessTypeName', align: 'center', width: '180' },
+  { text: '设备总数', value: 'createTime', align: 'center', width: '180' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
-const dataList = ref<Array<IGroupInfo>>([]) // 表格数据
+const dataList = ref<Array<IProductInfo>>([]) // 表格数据
 
 // 逻辑
 
 // 跳转到新建的页面
-const addDeviceGroup = () => {
-  refAddGroupDialog.value.initDialog({ type: 'create' })
+const addProduct = () => {
+  refAddProductDialog.value.initDialog({ type: 'create' })
 }
 
 // 详情
-const detail = (row: IGroupInfo) => {
+const detail = (row: IProductInfo) => {
   router.push({
     query: {
       type: 'detail',
@@ -55,9 +57,9 @@
 }
 
 // 编辑
-const updateById = (row: IGroupInfo) => {
+const updateById = (row: IProductInfo) => {
   sessionStorage.setItem('groupInfo', JSON.stringify(row))
-  refAddGroupDialog.value.initDialog({ type: 'update', id: row.id })
+  refAddProductDialog.value.initDialog({ type: 'update', id: row.id })
 }
 
 // 数据查询
@@ -67,7 +69,7 @@
     // 是否显示当前页，否则跳转第一页
     searchQuery.value.offset = 1
   }
-  getGroupListPage(searchQuery.value).then((response) => {
+  getProductListPage(searchQuery.value).then((response) => {
     if (response.code === 200) {
       dataList.value = response.data.rows
       total.value = parseInt(response.data.total)
@@ -96,7 +98,7 @@
 // 重置
 const reset = () => {
   searchQuery.value = {
-    groupName: '', // 分组名
+    productName: '', // 产品名
     beginTime: '', // 创建时间-起始
     endTime: '', // 创建时间-结束
     offset: 1,
@@ -106,25 +108,25 @@
 }
 
 // 删除
-const deleteById = (row: IGroupInfo) => {
-  ElMessageBox.confirm(`是否删除分组 ${row.groupName}`, '提示', {
+const deleteById = (row: IProductInfo) => {
+  ElMessageBox.confirm(`是否删除产品 ${row.productName}`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    delGroup(row.id!).then((res) => {
+    delProduct(row.id!).then((res) => {
       if (res.code === 200) {
-        ElMessage.success(`分组 ${row.groupName} 删除成功`)
+        ElMessage.success(`产品 ${row.productName} 删除成功`)
         fetchData(true)
       }
       else {
-        ElMessage.error(`分组 ${row.groupName} 删除失败: ${res.message}`)
+        ElMessage.error(`产品 ${row.productName} 删除失败: ${res.message}`)
       }
     })
   })
 }
 
-const groupSavedHandler = () => {
+const productSavedHandler = () => {
   fetchData(true)
 }
 
@@ -162,7 +164,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.groupName" placeholder="分组名称" clearable />
+        <el-input v-model="searchQuery.productName" placeholder="产品名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
@@ -170,10 +172,10 @@
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="分组管理">
+    <table-container title="产品管理">
       <!-- 表头区域 -->
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm(`/basic/group/add`)" icon="icon-add" title="新建" @click="addDeviceGroup" />
+        <icon-button v-if="proxy.hasPerm(`/basic/product/add`)" icon="icon-add" title="新建" @click="addProduct" />
       </template>
 
       <!-- 表格区域 -->
@@ -196,11 +198,11 @@
               <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 v-if="proxy.hasPerm(`/basic/product/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 v-if="proxy.hasPerm(`/basic/product/del`)" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
             </template>
@@ -209,6 +211,6 @@
       </normal-table>
     </table-container>
 
-    <add-group-dialog ref="refAddGroupDialog" @record-saved="groupSavedHandler" />
+    <add-product-dialog ref="refAddProductDialog" @record-saved="productSavedHandler" />
   </app-container>
 </template>
diff --git a/src/views/basic/product/product-info.ts b/src/views/basic/product/product-info.ts
new file mode 100644
index 0000000..edb2298
--- /dev/null
+++ b/src/views/basic/product/product-info.ts
@@ -0,0 +1,23 @@
+// 列表查询参数接口
+export interface IListQuery {
+  ids?: [] // id列表 导出用
+  productNo?: string
+  productName: string // 产品名
+  beginTime: string // 创建时间-开始
+  endTime: string // 创建时间-结束
+  offset: number
+  limit: number
+  sort?: string
+  order?: string
+}
+
+export interface IProductInfo {
+  id: string // id
+  productNo?: string // 产品编号
+  productName: string // 产品名称
+  deptid: string // 所属组织
+  deptName: string // 所属组织名称
+  descn: string // 分组描述
+  createUserId: string
+  createTime?: string
+}

diff --git a/public/favicon.ico b/public/favicon.ico
index b225e2c..5264a05 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/api/basic/config.ts b/src/api/basic/config.ts
new file mode 100644
index 0000000..8119f1a
--- /dev/null
+++ b/src/api/basic/config.ts
@@ -0,0 +1,68 @@
+import request from '../index'
+const prefix = 'bus/config'
+
+// 查询设备配置 分页
+export function getDeviceConfigListPage(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: string[]) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids,
+    },
+  })
+}
+
diff --git a/src/api/basic/device.ts b/src/api/basic/device.ts
index fe5bc37..3609deb 100644
--- a/src/api/basic/device.ts
+++ b/src/api/basic/device.ts
@@ -2,9 +2,9 @@
 const prefix = 'device'
 
 // 查询设备列表 分页
-export function getDeviceListPage(data: object) {
+export function getDeviceListPage(data: any) {
   return request({
-    url: `${prefix}/list-page`,
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
diff --git a/src/api/basic/product.ts b/src/api/basic/product.ts
new file mode 100644
index 0000000..3a08849
--- /dev/null
+++ b/src/api/basic/product.ts
@@ -0,0 +1,61 @@
+import request from '../index'
+const prefix = 'product'
+
+// 查询产品列表 分页
+export function getProductListPage(data: any) {
+  return request({
+    url: `${prefix}/list-page?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+// 查询产品详情
+export function detailProduct(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 addProduct(data: object) {
+  return request({
+    url: `${prefix}/add`,
+    method: 'post',
+    data,
+  })
+}
+// 修改产品
+export function updateProduct(data: object) {
+  return request({
+    url: `${prefix}/update`,
+    method: 'post',
+    data,
+  })
+}
+// 删除产品
+export function delProduct(id: string) {
+  return request({
+    url: `${prefix}/delete`,
+    method: 'post',
+    data: {
+      ids: [id],
+    },
+  })
+}
diff --git a/src/layouts/components/Tools/index.vue b/src/layouts/components/Tools/index.vue
index 130ee5d..ba20810 100644
--- a/src/layouts/components/Tools/index.vue
+++ b/src/layouts/components/Tools/index.vue
@@ -63,9 +63,6 @@
       break
   }
 }
-function pro() {
-  window.open('https://hooray.gitee.io/fantastic-admin-pro-example/', 'top')
-}
 onMounted(() => {
   // 连接 websocket
   websocket.initWebSocket()
@@ -105,6 +102,7 @@
           <svg-icon name="ep:setting" />
         </el-icon>
       </span>
+      <!--
       <span v-if="settingsStore.mode === 'pc'" class="item">
         <el-popover width="300">
           <template #reference>
@@ -143,6 +141,7 @@
           </template>
         </el-popover>
       </span>
+      -->
     </div>
     <el-dropdown class="user-container" size="default" @command="userCommand">
       <div class="user-wrapper">
diff --git a/src/layouts/components/TopMenu/topMenu.vue b/src/layouts/components/TopMenu/topMenu.vue
index bd386a9..10bbcb0 100644
--- a/src/layouts/components/TopMenu/topMenu.vue
+++ b/src/layouts/components/TopMenu/topMenu.vue
@@ -24,7 +24,7 @@
       class="top-menu"
     >
       <template v-for="(route, index) in menuStore.sidebarMenus">
-        <TopMenuItem v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path || index" :item="route" :base-path="route.path" :level="1" />
       </template>
     </el-menu>
   </div>
diff --git a/src/layouts/components/TopMenu/topMenuItem.vue b/src/layouts/components/TopMenu/topMenuItem.vue
index d787a1b..05ea1a5 100644
--- a/src/layouts/components/TopMenu/topMenuItem.vue
+++ b/src/layouts/components/TopMenu/topMenuItem.vue
@@ -51,7 +51,7 @@
         <span class="title">{{ item.meta.title }}</span>
       </template>
       <template v-for="route in item.children">
-        <topMenuItem v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
+        <top-menu-item v-if="route.meta.sidebar !== false" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path || '')" />
       </template>
     </el-sub-menu>
   </div>
diff --git a/src/views/basic/device/configList.vue b/src/views/basic/device/configList.vue
new file mode 100644
index 0000000..387d7f5
--- /dev/null
+++ b/src/views/basic/device/configList.vue
@@ -0,0 +1,268 @@
+<!-- 设备配置列表 -->
+<script name="DeviceConfigList" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
+import type { IConfigListQuery, IDeviceInfo } from './device-info'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { delDevice, exportDevice } from '@/api/basic/device'
+import { getDeviceConfigListPage } from '@/api/basic/config'
+
+const props = defineProps({
+  devcode: {
+    type: String,
+    default: '',
+  },
+})
+
+const router = useRouter()
+
+// 查询条件
+const searchQuery = ref<IConfigListQuery>({
+  devcode: props.devcode,
+  configType: '',
+  status: '',
+  beginTime: '',
+  endTime: '',
+  offset: 1,
+  limit: 20,
+})
+const dateRangeOper = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const total = ref(0) // 数据条数
+const loadingTable = ref(false) // 表格loading
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '配置类型', value: 'configTypeName', align: 'center', width: '120' },
+  { text: '配置内容', value: 'configJson', align: 'center' },
+  { text: '最大尝试次数', value: 'imei', align: 'center', width: '120' },
+  { text: '已尝试次数', value: 'productName', align: 'center', width: '120' },
+  { text: '下发状态', value: 'statusName', align: 'center', width: '120' },
+  { text: '操作时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '操作人', value: 'createUserName', align: 'center', width: '160' },
+])
+const dataList = ref<Array<IDeviceInfo>>([]) // 表格数据
+
+const configStatusDict = ref<Array<IDictType>>([])
+const configTypeDict = ref<Array<IDictType>>([])
+
+// 逻辑
+// 导出所有
+const exportAllDevice = () => {
+  if (dataList.value.length > 0) {
+    const filename = `设备列表${new Date().valueOf()}.xlsx`
+
+    const loading = ElLoading.service({
+      lock: true,
+      text: '下载中请稍后',
+      background: 'rgba(255, 255, 255, 0.8)',
+    })
+
+    // 导出接口
+    exportDevice(searchQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, filename)
+
+      nextTick(() => {
+        // 关闭loading
+        loading.close()
+      })
+    }).catch(() => {
+      loading.close()
+    })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+}
+
+// 详情
+const detail = (row: IDeviceInfo) => {
+  router.push({
+    query: {
+      type: 'detail',
+      id: row.id,
+    },
+    path: 'detail',
+  })
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    searchQuery.value.offset = 1
+  }
+  getDeviceConfigListPage(searchQuery.value).then((response) => {
+    if (response.code === 200) {
+      dataList.value = response.data.rows.map((item: IDeviceInfo) => {
+        return {
+          ...item,
+          createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'),
+        }
+      })
+      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 = {
+    devcode: '',
+    configType: '',
+    status: '',
+    beginTime: '',
+    endTime: '',
+    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 getConfigStatusDict = async () => {
+  getDictByCode('configStatus	').then((res: any) => {
+    if (res.code === 200) {
+      configStatusDict.value = res.data
+      sessionStorage.setItem('configStatus	', JSON.stringify(configStatusDict.value))
+    }
+  })
+}
+const getConfigTypeDict = async () => {
+  getDictByCode('configType').then((res: any) => {
+    if (res.code === 200) {
+      configTypeDict.value = res.data
+      sessionStorage.setItem('configType', JSON.stringify(configTypeDict.value))
+    }
+  })
+}
+const getDict = async () => {
+  await getConfigStatusDict()
+  await getConfigTypeDict()
+}
+
+// 监听父组件传过来的值
+watch(props, (val) => {
+  searchQuery.value.devcode = props.devcode
+})
+
+watch(dateRangeOper, (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.devcode" placeholder="设备编号" disabled />
+      </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.configType" placeholder="配置类型" clearable>
+          <el-option v-for="dict in configTypeDict" :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 configStatusDict" :key="item.id" :value="item.value" :label="item.name" />
+        </el-select>
+      </search-item>
+
+      <search-item>
+        <el-date-picker v-model="dateRangeOper" type="daterange" start-placeholder="操作时间（开始）" end-placeholder="操作时间（结束）" />
+      </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/device/detail.vue b/src/views/basic/device/detail.vue
index a2bd91d..a95575c 100644
--- a/src/views/basic/device/detail.vue
+++ b/src/views/basic/device/detail.vue
@@ -1,8 +1,8 @@
 <!-- 设备详情 -->
 <script name="DeviceInfoDetail" lang="ts" setup>
-import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type { IDictType } from '../common-interface'
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IDeviceInfo } from './device-info'
+import DeviceConfigList from './configList.vue'
 import DataQueryList from '@/views/data/query/list.vue'
 import { addDevice, detailDevice, updateDevice } from '@/api/basic/device'
 
@@ -226,7 +226,9 @@
         <data-query-list :embedded="true" :devcode="deviceInfo.devcode" />
       </template>
 
-      <template v-if="current === 'device-config'" />
+      <template v-if="current === 'device-config'">
+        <device-config-list :devcode="deviceInfo.devcode" />
+      </template>
 
       <template v-if="current === 'device-cell'">
         <detail-block :need-title="false" title="">
diff --git a/src/views/basic/device/device-info.ts b/src/views/basic/device/device-info.ts
index 9db63f4..e0ff66e 100644
--- a/src/views/basic/device/device-info.ts
+++ b/src/views/basic/device/device-info.ts
@@ -37,3 +37,15 @@
   createUserName?: string
   dataValue?: string
 }
+
+export interface IConfigListQuery {
+  devcode: string // 设备编号
+  configType: string // 配置类型
+  status: string // 配置状态
+  beginTime: string // 操作时间-开始
+  endTime: string // 操作时间-结束
+  offset?: number
+  limit?: number
+  sort?: string
+  order?: string
+}
diff --git a/src/views/basic/product/addGroupDialog.vue b/src/views/basic/product/addGroupDialog.vue
deleted file mode 100644
index d1f3405..0000000
--- a/src/views/basic/product/addGroupDialog.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<!-- 添加 / 编辑 -->
-<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/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
new file mode 100644
index 0000000..6e7fb6f
--- /dev/null
+++ b/src/views/basic/product/addProductDialog.vue
@@ -0,0 +1,189 @@
+<!-- 添加 / 编辑 -->group
+<script name="AddProductDialog" lang="ts" setup>
+import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IProductInfo } from './product-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<IProductInfo>({
+  id: '',
+  productName: '',
+  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: '',
+    productName: '',
+    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.productNo" :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.productName" 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/product/group-info.ts b/src/views/basic/product/group-info.ts
deleted file mode 100644
index 00bbef6..0000000
--- a/src/views/basic/product/group-info.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// 列表查询参数接口
-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/product/list.vue b/src/views/basic/product/list.vue
index 4b0fceb..6e3140a 100644
--- a/src/views/basic/product/list.vue
+++ b/src/views/basic/product/list.vue
@@ -1,21 +1,21 @@
-<!-- 分组管理 列表 -->
-<script name="GroupList" lang="ts" setup>
+<!-- 产品管理 列表 -->
+<script name="ProductList" 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 './addGroupDialog.vue'
+import type { IListQuery, IProductInfo } from './product-info'
+import AddProductDialog from './addProductDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { delGroup, getGroupListPage } from '@/api/basic/group'
+import { delProduct, getProductListPage } from '@/api/basic/product'
 import { getDictByCode } from '@/api/system/dict'
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
-const refAddGroupDialog = ref()
+const refAddProductDialog = ref()
 
 // 查询条件
 const searchQuery = ref<IListQuery>({
-  groupName: '', // 分组名
+  productName: '', // 产品名
   beginTime: '', // 创建时间-起始
   endTime: '', // 创建时间-结束
   offset: 1,
@@ -27,24 +27,26 @@
 
 // 表头
 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' },
+  { text: '产品编号', value: 'productNo', align: 'center', width: '160' },
+  { text: '产品名称', value: 'name', align: 'center' },
+  { text: '产品类型', value: 'productTypeName', align: 'center', width: '320' },
+  { text: '设备型号', value: 'model', align: 'center', width: '160' },
+  { text: '数据加密方式', value: 'encipherTypeName', align: 'center', width: '160' },
+  { text: '接入方式', value: 'accessTypeName', align: 'center', width: '180' },
+  { text: '设备总数', value: 'createTime', align: 'center', width: '180' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
-const dataList = ref<Array<IGroupInfo>>([]) // 表格数据
+const dataList = ref<Array<IProductInfo>>([]) // 表格数据
 
 // 逻辑
 
 // 跳转到新建的页面
-const addDeviceGroup = () => {
-  refAddGroupDialog.value.initDialog({ type: 'create' })
+const addProduct = () => {
+  refAddProductDialog.value.initDialog({ type: 'create' })
 }
 
 // 详情
-const detail = (row: IGroupInfo) => {
+const detail = (row: IProductInfo) => {
   router.push({
     query: {
       type: 'detail',
@@ -55,9 +57,9 @@
 }
 
 // 编辑
-const updateById = (row: IGroupInfo) => {
+const updateById = (row: IProductInfo) => {
   sessionStorage.setItem('groupInfo', JSON.stringify(row))
-  refAddGroupDialog.value.initDialog({ type: 'update', id: row.id })
+  refAddProductDialog.value.initDialog({ type: 'update', id: row.id })
 }
 
 // 数据查询
@@ -67,7 +69,7 @@
     // 是否显示当前页，否则跳转第一页
     searchQuery.value.offset = 1
   }
-  getGroupListPage(searchQuery.value).then((response) => {
+  getProductListPage(searchQuery.value).then((response) => {
     if (response.code === 200) {
       dataList.value = response.data.rows
       total.value = parseInt(response.data.total)
@@ -96,7 +98,7 @@
 // 重置
 const reset = () => {
   searchQuery.value = {
-    groupName: '', // 分组名
+    productName: '', // 产品名
     beginTime: '', // 创建时间-起始
     endTime: '', // 创建时间-结束
     offset: 1,
@@ -106,25 +108,25 @@
 }
 
 // 删除
-const deleteById = (row: IGroupInfo) => {
-  ElMessageBox.confirm(`是否删除分组 ${row.groupName}`, '提示', {
+const deleteById = (row: IProductInfo) => {
+  ElMessageBox.confirm(`是否删除产品 ${row.productName}`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    delGroup(row.id!).then((res) => {
+    delProduct(row.id!).then((res) => {
       if (res.code === 200) {
-        ElMessage.success(`分组 ${row.groupName} 删除成功`)
+        ElMessage.success(`产品 ${row.productName} 删除成功`)
         fetchData(true)
       }
       else {
-        ElMessage.error(`分组 ${row.groupName} 删除失败: ${res.message}`)
+        ElMessage.error(`产品 ${row.productName} 删除失败: ${res.message}`)
       }
     })
   })
 }
 
-const groupSavedHandler = () => {
+const productSavedHandler = () => {
   fetchData(true)
 }
 
@@ -162,7 +164,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.groupName" placeholder="分组名称" clearable />
+        <el-input v-model="searchQuery.productName" placeholder="产品名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
@@ -170,10 +172,10 @@
     </search-area>
 
     <!-- 表格数据展示 -->
-    <table-container title="分组管理">
+    <table-container title="产品管理">
       <!-- 表头区域 -->
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm(`/basic/group/add`)" icon="icon-add" title="新建" @click="addDeviceGroup" />
+        <icon-button v-if="proxy.hasPerm(`/basic/product/add`)" icon="icon-add" title="新建" @click="addProduct" />
       </template>
 
       <!-- 表格区域 -->
@@ -196,11 +198,11 @@
               <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 v-if="proxy.hasPerm(`/basic/product/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 v-if="proxy.hasPerm(`/basic/product/del`)" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
             </template>
@@ -209,6 +211,6 @@
       </normal-table>
     </table-container>
 
-    <add-group-dialog ref="refAddGroupDialog" @record-saved="groupSavedHandler" />
+    <add-product-dialog ref="refAddProductDialog" @record-saved="productSavedHandler" />
   </app-container>
 </template>
diff --git a/src/views/basic/product/product-info.ts b/src/views/basic/product/product-info.ts
new file mode 100644
index 0000000..edb2298
--- /dev/null
+++ b/src/views/basic/product/product-info.ts
@@ -0,0 +1,23 @@
+// 列表查询参数接口
+export interface IListQuery {
+  ids?: [] // id列表 导出用
+  productNo?: string
+  productName: string // 产品名
+  beginTime: string // 创建时间-开始
+  endTime: string // 创建时间-结束
+  offset: number
+  limit: number
+  sort?: string
+  order?: string
+}
+
+export interface IProductInfo {
+  id: string // id
+  productNo?: string // 产品编号
+  productName: string // 产品名称
+  deptid: string // 所属组织
+  deptName: string // 所属组织名称
+  descn: string // 分组描述
+  createUserId: string
+  createTime?: string
+}
diff --git a/src/views/data/query/list.vue b/src/views/data/query/list.vue
index d8a2839..9976ba3 100644
--- a/src/views/data/query/list.vue
+++ b/src/views/data/query/list.vue
@@ -215,7 +215,7 @@
 
 onMounted(async () => {
   await getDict()
-  // initQuerySearch()
+  initQuerySearch()
   searchList()
 })
 </script>