diff --git a/src/views/basic/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
index 6e7fb6f..00344d6 100644
--- a/src/views/basic/product/addProductDialog.vue
+++ b/src/views/basic/product/addProductDialog.vue
@@ -1,8 +1,10 @@
 <!-- 添加 / 编辑 -->group
 <script name="AddProductDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
 import type { IProductInfo } from './product-info'
-import { addGroup, updateGroup } from '@/api/basic/group'
+import { addProduct, updateProduct } from '@/api/basic/product'
+import { ca } from 'element-plus/es/locale'
 
 const emit = defineEmits(['recordSaved'])
 
@@ -14,34 +16,58 @@
 
 const infoFormRef = ref()
 
-const groupInfo = ref<IProductInfo>({
+const productInfo = ref<IProductInfo>({
   id: '',
-  productName: '',
-  deptid: '',
-  deptName: '',
-  descn: '',
+  productNo: '', // 产品编号
+  name: '', // 产品名称
+  accessType: '', // 接入类型
+  powerType: '', // 供电方式
+  encipherType: '', // 加密类型
+  communicationProtocol: '', // 协议类型
+  productType: '',  // 产品类别
+  deviceType: '',  // 设备类型
+  model: '',  // 型号
+  offlineRule: '',
+  description: '', // 产品描述
+  owners: '', // 产品负责人
   createUserId: '',
   createTime: '',
 })
 
 const groupInfoRules = ref({
-  groupName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-  deptid: [{ required: true, message: '所属组织不能为空，请选择', trigger: ['blur', 'change'] }],
-  descn: [{ required: true, message: '产品描述不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '设备型号不能为空，请选择', trigger: 'blur' }],
+  encipherType: [{ required: true, message: '加密方式不能为空，请选择', trigger: 'blur' }],
 }) // 表单验证规则
 
 const showDialog = ref<boolean>(false)
+const canEdit = ref<boolean>(true)
+
+const deviceTypeDict = ref<Array<IDictType>>([])
+const accessTypeDict = ref<Array<IDictType>>([])
+const powerTypeDict = ref<Array<IDictType>>([])
+const encipherTypeDict = ref<Array<IDictType>>([])
+const communicationDict = ref<Array<IDictType>>([])
 
 // 逻辑
 const resetForm = () => {
-  sessionStorage.removeItem('groupInfo') // 返回列表时 将缓存中的数据删除
+  sessionStorage.removeItem('productInfo') // 返回列表时 将缓存中的数据删除
 
-  groupInfo.value = {
+  productInfo.value = {
     id: '',
-    productName: '',
-    deptid: '',
-    deptName: '',
-    descn: '',
+    productNo: '', // 产品编号
+    name: '', // 产品名称
+    accessType: '', // 接入类型
+    powerType: '', // 供电方式
+    encipherType: '', // 加密类型
+    communicationProtocol: '', // 协议类型
+    productType: '',  // 产品类别
+    deviceType: '',  // 设备类型
+    model: '',  // 型号
+    offlineRule: '',
+    description: '', // 产品描述
+    owners: '', // 产品负责人
     createUserId: '',
     createTime: '',
   }
@@ -53,8 +79,8 @@
 // 添加
 const saveInfo = () => {
   // 将创建时间改为提交的时间
-  groupInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-  addGroup(groupInfo.value).then((res) => {
+  productInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addProduct(productInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -70,7 +96,7 @@
 }
 // 编辑
 const updateInfoById = () => {
-  updateGroup(groupInfo.value).then((res) => {
+  updateProduct(productInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -112,26 +138,62 @@
 }
 
 const initDialog = (params: any) => {
+  getDict()
+
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
 
-  switch (params.type) {
-    case 'create' :
-      title.value = '新增产品'
+  setTimeout(() => {
+    switch (params.type) {
+      case 'create' :
+        title.value = '新增产品'
+        canEdit.value = true
+        break
 
-      break
-    case 'update':
-      title.value = '编辑产品'
-      groupInfo.value = JSON.parse(sessionStorage.getItem('groupInfo')!)
+      case 'update':
+        title.value = '编辑产品'
+        canEdit.value = true
+        productInfo.value = JSON.parse(sessionStorage.getItem('productInfo')!)
+        break
 
-      break
-    default:
-      title.value = ''
-      break
-  }
+      case 'detail':
+        title.value = '产品详情'
+        canEdit.value = false
+        productInfo.value = JSON.parse(sessionStorage.getItem('productInfo')!)
+        break
 
-  showDialog.value = true
+      default:
+        title.value = ''
+        break
+    }
+
+    showDialog.value = true
+  }, 100)
+}
+
+// 获取在用状态字典值
+const getDeviceTypeDict = () => {
+  deviceTypeDict.value = JSON.parse(sessionStorage.getItem("deviceType")!)
+}
+const getAccessTypeDict = () => {
+  accessTypeDict.value = JSON.parse(sessionStorage.getItem("accessType")!)
+}
+const getPowerTypeDict = () => {
+  powerTypeDict.value = JSON.parse(sessionStorage.getItem("powerType")!)
+}
+const getEncipherTypeDict = () => {
+  encipherTypeDict.value = JSON.parse(sessionStorage.getItem("encipherType")!)
+}
+const getCommunicationDict = () => {
+  communicationDict.value = JSON.parse(sessionStorage.getItem("communicationProtocol")!)
+}
+const getDict = async () => {
+  getDeviceTypeDict()
+  getAccessTypeDict()
+  getPowerTypeDict()
+  getEncipherTypeDict()
+  getCommunicationDict()
 }
 
 defineExpose({
@@ -142,35 +204,91 @@
 <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 ref="infoFormRef" :model="productInfo" :rules="groupInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="12">
             <el-form-item label="产品编号">
-              <el-input v-model="groupInfo.productNo" :disabled="true" />
+              <el-input v-model="productInfo.productNo" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="产品名称" prop="name">
+              <el-input v-model="productInfo.name" placeholder="请输入产品名称" :disabled="!canEdit" clearable />
             </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-col :span="12">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-model="productInfo.deviceType" placeholder="请选择设备类型" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="设备型号" prop="model">
+              <el-input v-model="productInfo.model" placeholder="请输入设备型号" :disabled="!canEdit" 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-col :span="12">
+            <el-form-item label="通信方式" prop="communicationProtocol">
+              <el-select v-model="productInfo.communicationProtocol" placeholder="请选择通信方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in communicationDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="加密方式" prop="encipherType">
+              <el-select v-model="productInfo.encipherType" placeholder="请选择加密方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in encipherTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
             </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-col :span="12">
+            <el-form-item label="接入类型" prop="accessType">
+              <el-select v-model="productInfo.accessType" placeholder="请选择接入类型" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in accessTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供电方式">
+              <el-select v-model="productInfo.powerType" placeholder="请选择供电方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in powerTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="产品负责人">
+              <el-input v-model="productInfo.owners" placeholder="请输入产品负责人" :disabled="!canEdit" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="离线规则（天）">
+              <el-input v-model="productInfo.offlineRule" placeholder="请输入离线规则（天）" :disabled="!canEdit" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="产品描述">
+              <el-input v-model="productInfo.description" placeholder="请输入产品描述" type="textarea" :rows="3" :disabled="!canEdit" clearable />
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/src/views/basic/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
index 6e7fb6f..00344d6 100644
--- a/src/views/basic/product/addProductDialog.vue
+++ b/src/views/basic/product/addProductDialog.vue
@@ -1,8 +1,10 @@
 <!-- 添加 / 编辑 -->group
 <script name="AddProductDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
 import type { IProductInfo } from './product-info'
-import { addGroup, updateGroup } from '@/api/basic/group'
+import { addProduct, updateProduct } from '@/api/basic/product'
+import { ca } from 'element-plus/es/locale'
 
 const emit = defineEmits(['recordSaved'])
 
@@ -14,34 +16,58 @@
 
 const infoFormRef = ref()
 
-const groupInfo = ref<IProductInfo>({
+const productInfo = ref<IProductInfo>({
   id: '',
-  productName: '',
-  deptid: '',
-  deptName: '',
-  descn: '',
+  productNo: '', // 产品编号
+  name: '', // 产品名称
+  accessType: '', // 接入类型
+  powerType: '', // 供电方式
+  encipherType: '', // 加密类型
+  communicationProtocol: '', // 协议类型
+  productType: '',  // 产品类别
+  deviceType: '',  // 设备类型
+  model: '',  // 型号
+  offlineRule: '',
+  description: '', // 产品描述
+  owners: '', // 产品负责人
   createUserId: '',
   createTime: '',
 })
 
 const groupInfoRules = ref({
-  groupName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-  deptid: [{ required: true, message: '所属组织不能为空，请选择', trigger: ['blur', 'change'] }],
-  descn: [{ required: true, message: '产品描述不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '设备型号不能为空，请选择', trigger: 'blur' }],
+  encipherType: [{ required: true, message: '加密方式不能为空，请选择', trigger: 'blur' }],
 }) // 表单验证规则
 
 const showDialog = ref<boolean>(false)
+const canEdit = ref<boolean>(true)
+
+const deviceTypeDict = ref<Array<IDictType>>([])
+const accessTypeDict = ref<Array<IDictType>>([])
+const powerTypeDict = ref<Array<IDictType>>([])
+const encipherTypeDict = ref<Array<IDictType>>([])
+const communicationDict = ref<Array<IDictType>>([])
 
 // 逻辑
 const resetForm = () => {
-  sessionStorage.removeItem('groupInfo') // 返回列表时 将缓存中的数据删除
+  sessionStorage.removeItem('productInfo') // 返回列表时 将缓存中的数据删除
 
-  groupInfo.value = {
+  productInfo.value = {
     id: '',
-    productName: '',
-    deptid: '',
-    deptName: '',
-    descn: '',
+    productNo: '', // 产品编号
+    name: '', // 产品名称
+    accessType: '', // 接入类型
+    powerType: '', // 供电方式
+    encipherType: '', // 加密类型
+    communicationProtocol: '', // 协议类型
+    productType: '',  // 产品类别
+    deviceType: '',  // 设备类型
+    model: '',  // 型号
+    offlineRule: '',
+    description: '', // 产品描述
+    owners: '', // 产品负责人
     createUserId: '',
     createTime: '',
   }
@@ -53,8 +79,8 @@
 // 添加
 const saveInfo = () => {
   // 将创建时间改为提交的时间
-  groupInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-  addGroup(groupInfo.value).then((res) => {
+  productInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addProduct(productInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -70,7 +96,7 @@
 }
 // 编辑
 const updateInfoById = () => {
-  updateGroup(groupInfo.value).then((res) => {
+  updateProduct(productInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -112,26 +138,62 @@
 }
 
 const initDialog = (params: any) => {
+  getDict()
+
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
 
-  switch (params.type) {
-    case 'create' :
-      title.value = '新增产品'
+  setTimeout(() => {
+    switch (params.type) {
+      case 'create' :
+        title.value = '新增产品'
+        canEdit.value = true
+        break
 
-      break
-    case 'update':
-      title.value = '编辑产品'
-      groupInfo.value = JSON.parse(sessionStorage.getItem('groupInfo')!)
+      case 'update':
+        title.value = '编辑产品'
+        canEdit.value = true
+        productInfo.value = JSON.parse(sessionStorage.getItem('productInfo')!)
+        break
 
-      break
-    default:
-      title.value = ''
-      break
-  }
+      case 'detail':
+        title.value = '产品详情'
+        canEdit.value = false
+        productInfo.value = JSON.parse(sessionStorage.getItem('productInfo')!)
+        break
 
-  showDialog.value = true
+      default:
+        title.value = ''
+        break
+    }
+
+    showDialog.value = true
+  }, 100)
+}
+
+// 获取在用状态字典值
+const getDeviceTypeDict = () => {
+  deviceTypeDict.value = JSON.parse(sessionStorage.getItem("deviceType")!)
+}
+const getAccessTypeDict = () => {
+  accessTypeDict.value = JSON.parse(sessionStorage.getItem("accessType")!)
+}
+const getPowerTypeDict = () => {
+  powerTypeDict.value = JSON.parse(sessionStorage.getItem("powerType")!)
+}
+const getEncipherTypeDict = () => {
+  encipherTypeDict.value = JSON.parse(sessionStorage.getItem("encipherType")!)
+}
+const getCommunicationDict = () => {
+  communicationDict.value = JSON.parse(sessionStorage.getItem("communicationProtocol")!)
+}
+const getDict = async () => {
+  getDeviceTypeDict()
+  getAccessTypeDict()
+  getPowerTypeDict()
+  getEncipherTypeDict()
+  getCommunicationDict()
 }
 
 defineExpose({
@@ -142,35 +204,91 @@
 <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 ref="infoFormRef" :model="productInfo" :rules="groupInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="12">
             <el-form-item label="产品编号">
-              <el-input v-model="groupInfo.productNo" :disabled="true" />
+              <el-input v-model="productInfo.productNo" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="产品名称" prop="name">
+              <el-input v-model="productInfo.name" placeholder="请输入产品名称" :disabled="!canEdit" clearable />
             </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-col :span="12">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-model="productInfo.deviceType" placeholder="请选择设备类型" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="设备型号" prop="model">
+              <el-input v-model="productInfo.model" placeholder="请输入设备型号" :disabled="!canEdit" 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-col :span="12">
+            <el-form-item label="通信方式" prop="communicationProtocol">
+              <el-select v-model="productInfo.communicationProtocol" placeholder="请选择通信方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in communicationDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="加密方式" prop="encipherType">
+              <el-select v-model="productInfo.encipherType" placeholder="请选择加密方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in encipherTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
             </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-col :span="12">
+            <el-form-item label="接入类型" prop="accessType">
+              <el-select v-model="productInfo.accessType" placeholder="请选择接入类型" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in accessTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供电方式">
+              <el-select v-model="productInfo.powerType" placeholder="请选择供电方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in powerTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="产品负责人">
+              <el-input v-model="productInfo.owners" placeholder="请输入产品负责人" :disabled="!canEdit" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="离线规则（天）">
+              <el-input v-model="productInfo.offlineRule" placeholder="请输入离线规则（天）" :disabled="!canEdit" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="产品描述">
+              <el-input v-model="productInfo.description" placeholder="请输入产品描述" type="textarea" :rows="3" :disabled="!canEdit" clearable />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/basic/product/list.vue b/src/views/basic/product/list.vue
index 6e3140a..d01b451 100644
--- a/src/views/basic/product/list.vue
+++ b/src/views/basic/product/list.vue
@@ -2,6 +2,7 @@
 <script name="ProductList" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
 import type { IListQuery, IProductInfo } from './product-info'
 import AddProductDialog from './addProductDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,13 +10,13 @@
 import { getDictByCode } from '@/api/system/dict'
 
 const { proxy } = getCurrentInstance() as any
-const router = useRouter()
 
 const refAddProductDialog = ref()
 
 // 查询条件
 const searchQuery = ref<IListQuery>({
   productName: '', // 产品名
+  deviceType: '',
   beginTime: '', // 创建时间-起始
   endTime: '', // 创建时间-结束
   offset: 1,
@@ -29,15 +30,21 @@
 const columns = ref<TableColumn[]>([
   { 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: 'deviceTypeName', align: 'center', width: '180' },
+  { text: '设备型号', value: 'model', align: 'center', width: '200' },
+  { text: '数据加密方式', value: 'encipherTypeName', align: 'center', width: '180' },
+  { text: '通信方式', value: 'communicationProtocolName', align: 'center', width: '180' },
   { 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<IProductInfo>>([]) // 表格数据
 
+const deviceTypeDict = ref<Array<IDictType>>([])
+const accessTypeDict = ref<Array<IDictType>>([])
+const powerTypeDict = ref<Array<IDictType>>([])
+const encipherTypeDict = ref<Array<IDictType>>([])
+const communicationDict = ref<Array<IDictType>>([])
+
 // 逻辑
 
 // 跳转到新建的页面
@@ -47,18 +54,13 @@
 
 // 详情
 const detail = (row: IProductInfo) => {
-  router.push({
-    query: {
-      type: 'detail',
-      id: row.id,
-    },
-    path: 'detail',
-  })
+  sessionStorage.setItem('productInfo', JSON.stringify(row))
+  refAddProductDialog.value.initDialog({ type: 'detail' })
 }
 
 // 编辑
 const updateById = (row: IProductInfo) => {
-  sessionStorage.setItem('groupInfo', JSON.stringify(row))
+  sessionStorage.setItem('productInfo', JSON.stringify(row))
   refAddProductDialog.value.initDialog({ type: 'update', id: row.id })
 }
 
@@ -109,18 +111,18 @@
 
 // 删除
 const deleteById = (row: IProductInfo) => {
-  ElMessageBox.confirm(`是否删除产品 ${row.productName}`, '提示', {
+  ElMessageBox.confirm(`是否删除产品 ${row.name}`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
     delProduct(row.id!).then((res) => {
       if (res.code === 200) {
-        ElMessage.success(`产品 ${row.productName} 删除成功`)
+        ElMessage.success(`产品 ${row.name} 删除成功`)
         fetchData(true)
       }
       else {
-        ElMessage.error(`产品 ${row.productName} 删除失败: ${res.message}`)
+        ElMessage.error(`产品 ${row.name} 删除失败: ${res.message}`)
       }
     })
   })
@@ -134,12 +136,49 @@
 const getDeviceTypeDict = () => {
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
+      deviceTypeDict.value = res.data
       sessionStorage.setItem('deviceType', JSON.stringify(res.data))
     }
   })
 }
+const getAccessTypeDict = () => {
+  getDictByCode('accessType').then((res: any) => {
+    if (res.code === 200) {
+      accessTypeDict.value = res.data
+      sessionStorage.setItem('accessType', JSON.stringify(res.data))
+    }
+  })
+}
+const getPowerTypeDict = () => {
+  getDictByCode('powerType').then((res: any) => {
+    if (res.code === 200) {
+      powerTypeDict.value = res.data
+      sessionStorage.setItem('powerType', JSON.stringify(res.data))
+    }
+  })
+}
+const getEncipherTypeDict = () => {
+  getDictByCode('encipherType').then((res: any) => {
+    if (res.code === 200) {
+      encipherTypeDict.value = res.data
+      sessionStorage.setItem('encipherType', JSON.stringify(res.data))
+    }
+  })
+}
+const getCommunicationDict = () => {
+  getDictByCode('communicationProtocol').then((res: any) => {
+    if (res.code === 200) {
+      communicationDict.value = res.data
+      sessionStorage.setItem('communicationProtocol', JSON.stringify(res.data))
+    }
+  })
+}
 const getDict = async () => {
   getDeviceTypeDict()
+  getAccessTypeDict()
+  getPowerTypeDict()
+  getEncipherTypeDict()
+  getCommunicationDict()
 }
 
 watch(dateRange, (val) => {
@@ -167,6 +206,11 @@
         <el-input v-model="searchQuery.productName" placeholder="产品名称" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="searchQuery.deviceType" placeholder="请选择设备类型" clearable>
+          <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
       </search-item>
     </search-area>

diff --git a/src/views/basic/product/addProductDialog.vue b/src/views/basic/product/addProductDialog.vue
index 6e7fb6f..00344d6 100644
--- a/src/views/basic/product/addProductDialog.vue
+++ b/src/views/basic/product/addProductDialog.vue
@@ -1,8 +1,10 @@
 <!-- 添加 / 编辑 -->group
 <script name="AddProductDialog" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import type { IDictType } from '../common-interface'
 import type { IProductInfo } from './product-info'
-import { addGroup, updateGroup } from '@/api/basic/group'
+import { addProduct, updateProduct } from '@/api/basic/product'
+import { ca } from 'element-plus/es/locale'
 
 const emit = defineEmits(['recordSaved'])
 
@@ -14,34 +16,58 @@
 
 const infoFormRef = ref()
 
-const groupInfo = ref<IProductInfo>({
+const productInfo = ref<IProductInfo>({
   id: '',
-  productName: '',
-  deptid: '',
-  deptName: '',
-  descn: '',
+  productNo: '', // 产品编号
+  name: '', // 产品名称
+  accessType: '', // 接入类型
+  powerType: '', // 供电方式
+  encipherType: '', // 加密类型
+  communicationProtocol: '', // 协议类型
+  productType: '',  // 产品类别
+  deviceType: '',  // 设备类型
+  model: '',  // 型号
+  offlineRule: '',
+  description: '', // 产品描述
+  owners: '', // 产品负责人
   createUserId: '',
   createTime: '',
 })
 
 const groupInfoRules = ref({
-  groupName: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
-  deptid: [{ required: true, message: '所属组织不能为空，请选择', trigger: ['blur', 'change'] }],
-  descn: [{ required: true, message: '产品描述不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+  deviceType: [{ required: true, message: '设备类型不能为空，请选择', trigger: ['blur', 'change'] }],
+  model: [{ required: true, message: '设备型号不能为空，请选择', trigger: 'blur' }],
+  encipherType: [{ required: true, message: '加密方式不能为空，请选择', trigger: 'blur' }],
 }) // 表单验证规则
 
 const showDialog = ref<boolean>(false)
+const canEdit = ref<boolean>(true)
+
+const deviceTypeDict = ref<Array<IDictType>>([])
+const accessTypeDict = ref<Array<IDictType>>([])
+const powerTypeDict = ref<Array<IDictType>>([])
+const encipherTypeDict = ref<Array<IDictType>>([])
+const communicationDict = ref<Array<IDictType>>([])
 
 // 逻辑
 const resetForm = () => {
-  sessionStorage.removeItem('groupInfo') // 返回列表时 将缓存中的数据删除
+  sessionStorage.removeItem('productInfo') // 返回列表时 将缓存中的数据删除
 
-  groupInfo.value = {
+  productInfo.value = {
     id: '',
-    productName: '',
-    deptid: '',
-    deptName: '',
-    descn: '',
+    productNo: '', // 产品编号
+    name: '', // 产品名称
+    accessType: '', // 接入类型
+    powerType: '', // 供电方式
+    encipherType: '', // 加密类型
+    communicationProtocol: '', // 协议类型
+    productType: '',  // 产品类别
+    deviceType: '',  // 设备类型
+    model: '',  // 型号
+    offlineRule: '',
+    description: '', // 产品描述
+    owners: '', // 产品负责人
     createUserId: '',
     createTime: '',
   }
@@ -53,8 +79,8 @@
 // 添加
 const saveInfo = () => {
   // 将创建时间改为提交的时间
-  groupInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
-  addGroup(groupInfo.value).then((res) => {
+  productInfo.value.createTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
+  addProduct(productInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -70,7 +96,7 @@
 }
 // 编辑
 const updateInfoById = () => {
-  updateGroup(groupInfo.value).then((res) => {
+  updateProduct(productInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -112,26 +138,62 @@
 }
 
 const initDialog = (params: any) => {
+  getDict()
+
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
 
-  switch (params.type) {
-    case 'create' :
-      title.value = '新增产品'
+  setTimeout(() => {
+    switch (params.type) {
+      case 'create' :
+        title.value = '新增产品'
+        canEdit.value = true
+        break
 
-      break
-    case 'update':
-      title.value = '编辑产品'
-      groupInfo.value = JSON.parse(sessionStorage.getItem('groupInfo')!)
+      case 'update':
+        title.value = '编辑产品'
+        canEdit.value = true
+        productInfo.value = JSON.parse(sessionStorage.getItem('productInfo')!)
+        break
 
-      break
-    default:
-      title.value = ''
-      break
-  }
+      case 'detail':
+        title.value = '产品详情'
+        canEdit.value = false
+        productInfo.value = JSON.parse(sessionStorage.getItem('productInfo')!)
+        break
 
-  showDialog.value = true
+      default:
+        title.value = ''
+        break
+    }
+
+    showDialog.value = true
+  }, 100)
+}
+
+// 获取在用状态字典值
+const getDeviceTypeDict = () => {
+  deviceTypeDict.value = JSON.parse(sessionStorage.getItem("deviceType")!)
+}
+const getAccessTypeDict = () => {
+  accessTypeDict.value = JSON.parse(sessionStorage.getItem("accessType")!)
+}
+const getPowerTypeDict = () => {
+  powerTypeDict.value = JSON.parse(sessionStorage.getItem("powerType")!)
+}
+const getEncipherTypeDict = () => {
+  encipherTypeDict.value = JSON.parse(sessionStorage.getItem("encipherType")!)
+}
+const getCommunicationDict = () => {
+  communicationDict.value = JSON.parse(sessionStorage.getItem("communicationProtocol")!)
+}
+const getDict = async () => {
+  getDeviceTypeDict()
+  getAccessTypeDict()
+  getPowerTypeDict()
+  getEncipherTypeDict()
+  getCommunicationDict()
 }
 
 defineExpose({
@@ -142,35 +204,91 @@
 <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 ref="infoFormRef" :model="productInfo" :rules="groupInfoRules" label-position="right" label-width="110px" border stripe>
+        <el-row :gutter="24">
+          <el-col :span="12">
             <el-form-item label="产品编号">
-              <el-input v-model="groupInfo.productNo" :disabled="true" />
+              <el-input v-model="productInfo.productNo" :disabled="true" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="产品名称" prop="name">
+              <el-input v-model="productInfo.name" placeholder="请输入产品名称" :disabled="!canEdit" clearable />
             </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-col :span="12">
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-model="productInfo.deviceType" placeholder="请选择设备类型" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="设备型号" prop="model">
+              <el-input v-model="productInfo.model" placeholder="请输入设备型号" :disabled="!canEdit" 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-col :span="12">
+            <el-form-item label="通信方式" prop="communicationProtocol">
+              <el-select v-model="productInfo.communicationProtocol" placeholder="请选择通信方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in communicationDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="加密方式" prop="encipherType">
+              <el-select v-model="productInfo.encipherType" placeholder="请选择加密方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in encipherTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
             </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-col :span="12">
+            <el-form-item label="接入类型" prop="accessType">
+              <el-select v-model="productInfo.accessType" placeholder="请选择接入类型" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in accessTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="供电方式">
+              <el-select v-model="productInfo.powerType" placeholder="请选择供电方式" :disabled="!canEdit" clearable style="width: 100%;">
+                <el-option v-for="dict in powerTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="产品负责人">
+              <el-input v-model="productInfo.owners" placeholder="请输入产品负责人" :disabled="!canEdit" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="离线规则（天）">
+              <el-input v-model="productInfo.offlineRule" placeholder="请输入离线规则（天）" :disabled="!canEdit" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="24">
+          <el-col :span="24">
+            <el-form-item label="产品描述">
+              <el-input v-model="productInfo.description" placeholder="请输入产品描述" type="textarea" :rows="3" :disabled="!canEdit" clearable />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/basic/product/list.vue b/src/views/basic/product/list.vue
index 6e3140a..d01b451 100644
--- a/src/views/basic/product/list.vue
+++ b/src/views/basic/product/list.vue
@@ -2,6 +2,7 @@
 <script name="ProductList" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
+import type { IDictType } from '../common-interface'
 import type { IListQuery, IProductInfo } from './product-info'
 import AddProductDialog from './addProductDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -9,13 +10,13 @@
 import { getDictByCode } from '@/api/system/dict'
 
 const { proxy } = getCurrentInstance() as any
-const router = useRouter()
 
 const refAddProductDialog = ref()
 
 // 查询条件
 const searchQuery = ref<IListQuery>({
   productName: '', // 产品名
+  deviceType: '',
   beginTime: '', // 创建时间-起始
   endTime: '', // 创建时间-结束
   offset: 1,
@@ -29,15 +30,21 @@
 const columns = ref<TableColumn[]>([
   { 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: 'deviceTypeName', align: 'center', width: '180' },
+  { text: '设备型号', value: 'model', align: 'center', width: '200' },
+  { text: '数据加密方式', value: 'encipherTypeName', align: 'center', width: '180' },
+  { text: '通信方式', value: 'communicationProtocolName', align: 'center', width: '180' },
   { 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<IProductInfo>>([]) // 表格数据
 
+const deviceTypeDict = ref<Array<IDictType>>([])
+const accessTypeDict = ref<Array<IDictType>>([])
+const powerTypeDict = ref<Array<IDictType>>([])
+const encipherTypeDict = ref<Array<IDictType>>([])
+const communicationDict = ref<Array<IDictType>>([])
+
 // 逻辑
 
 // 跳转到新建的页面
@@ -47,18 +54,13 @@
 
 // 详情
 const detail = (row: IProductInfo) => {
-  router.push({
-    query: {
-      type: 'detail',
-      id: row.id,
-    },
-    path: 'detail',
-  })
+  sessionStorage.setItem('productInfo', JSON.stringify(row))
+  refAddProductDialog.value.initDialog({ type: 'detail' })
 }
 
 // 编辑
 const updateById = (row: IProductInfo) => {
-  sessionStorage.setItem('groupInfo', JSON.stringify(row))
+  sessionStorage.setItem('productInfo', JSON.stringify(row))
   refAddProductDialog.value.initDialog({ type: 'update', id: row.id })
 }
 
@@ -109,18 +111,18 @@
 
 // 删除
 const deleteById = (row: IProductInfo) => {
-  ElMessageBox.confirm(`是否删除产品 ${row.productName}`, '提示', {
+  ElMessageBox.confirm(`是否删除产品 ${row.name}`, '提示', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
     delProduct(row.id!).then((res) => {
       if (res.code === 200) {
-        ElMessage.success(`产品 ${row.productName} 删除成功`)
+        ElMessage.success(`产品 ${row.name} 删除成功`)
         fetchData(true)
       }
       else {
-        ElMessage.error(`产品 ${row.productName} 删除失败: ${res.message}`)
+        ElMessage.error(`产品 ${row.name} 删除失败: ${res.message}`)
       }
     })
   })
@@ -134,12 +136,49 @@
 const getDeviceTypeDict = () => {
   getDictByCode('deviceType').then((res: any) => {
     if (res.code === 200) {
+      deviceTypeDict.value = res.data
       sessionStorage.setItem('deviceType', JSON.stringify(res.data))
     }
   })
 }
+const getAccessTypeDict = () => {
+  getDictByCode('accessType').then((res: any) => {
+    if (res.code === 200) {
+      accessTypeDict.value = res.data
+      sessionStorage.setItem('accessType', JSON.stringify(res.data))
+    }
+  })
+}
+const getPowerTypeDict = () => {
+  getDictByCode('powerType').then((res: any) => {
+    if (res.code === 200) {
+      powerTypeDict.value = res.data
+      sessionStorage.setItem('powerType', JSON.stringify(res.data))
+    }
+  })
+}
+const getEncipherTypeDict = () => {
+  getDictByCode('encipherType').then((res: any) => {
+    if (res.code === 200) {
+      encipherTypeDict.value = res.data
+      sessionStorage.setItem('encipherType', JSON.stringify(res.data))
+    }
+  })
+}
+const getCommunicationDict = () => {
+  getDictByCode('communicationProtocol').then((res: any) => {
+    if (res.code === 200) {
+      communicationDict.value = res.data
+      sessionStorage.setItem('communicationProtocol', JSON.stringify(res.data))
+    }
+  })
+}
 const getDict = async () => {
   getDeviceTypeDict()
+  getAccessTypeDict()
+  getPowerTypeDict()
+  getEncipherTypeDict()
+  getCommunicationDict()
 }
 
 watch(dateRange, (val) => {
@@ -167,6 +206,11 @@
         <el-input v-model="searchQuery.productName" placeholder="产品名称" clearable />
       </search-item>
       <search-item>
+        <el-select v-model="searchQuery.deviceType" placeholder="请选择设备类型" clearable>
+          <el-option v-for="dict in deviceTypeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+        </el-select>
+      </search-item>
+      <search-item>
         <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
       </search-item>
     </search-area>
diff --git a/src/views/basic/product/product-info.ts b/src/views/basic/product/product-info.ts
index edb2298..f3ae143 100644
--- a/src/views/basic/product/product-info.ts
+++ b/src/views/basic/product/product-info.ts
@@ -2,6 +2,7 @@
 export interface IListQuery {
   ids?: [] // id列表 导出用
   productNo?: string
+  deviceType?: string
   productName: string // 产品名
   beginTime: string // 创建时间-开始
   endTime: string // 创建时间-结束
@@ -14,10 +15,24 @@
 export interface IProductInfo {
   id: string // id
   productNo?: string // 产品编号
-  productName: string // 产品名称
-  deptid: string // 所属组织
-  deptName: string // 所属组织名称
-  descn: string // 分组描述
-  createUserId: string
+  name: string // 产品名称
+  accessType?: string // 接入类型
+  accessTypeName?: string
+  powerType?: string // 供电方式
+  powerTypeName?: string
+  encipherType?: string // 加密类型
+  encipherTypeName?: string
+  communicationProtocol?: string // 协议类型
+  communicationProtocolName?: string
+  productType?: string // 产品类别
+  productTypeName?: string
+  deviceType?: string // 设备类型
+  deviceTypeName?: string
+  model?: string // 型号
+  offlineRule?: string // 离线规则
+  description?: string // 产品描述
+  owners?: string // 产品负责人
+  createUserId?: string
+  createUserName?: string
   createTime?: string
 }