diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
new file mode 100644
index 0000000..9dd5b06
--- /dev/null
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -0,0 +1,171 @@
+<!--
+  Description: 产品管理-新建编辑
+  Author: 李亚光
+  Date: 2023-07-15
+ -->
+<script lang="ts" setup name="EditProduct">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  name: '', // 产品名称
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+} // 表头显示标题
+const rules: FormRules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    id: '', // 编号
+  }
+}
+
+// 初始化对话框
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'edit') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      id: row.id, // 编号
+    }
+  }
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      btnLoading.value = true
+      // addArea(areaForm.value).then((response) => {
+      //   if (response.code === 200) {
+      //     // 通知父组件刷新状态
+      //     dialogFormVisible.value = false
+      //     setTimeout(() => {
+      //       emits('refresh')
+      //     })
+      //   }
+      // }).catch((_) => { // 异常情况，loading置为false
+      // })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      // updateArea(areaForm.value).then((response) => {
+      //   if (response.code === 200) {
+      //     ElMessage({
+      //       message: '修改成功',
+      //       type: 'success',
+      //     })
+      //     dataFormRef.value.clearValidate()
+      //     setTimeout(() => {
+      //       emits('refresh')
+      //     })
+      //     dialogFormVisible.value = false
+      //   }
+      // }).catch((_) => { // 异常情况，loading置为false
+      // })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}产品`" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="产品名称" prop="areaName">
+            <el-input v-model.trim="dataForm.areaName" type="text" placeholder="产品名称" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="simpleName">
+            <el-select v-model="dataForm.simpleName" placeholder="设备类型" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="id">
+            <el-input v-model.trim="dataForm.id" type="text" placeholder="设备型号" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="厂商" prop="pName">
+            <el-select v-model="dataForm.simpleName" placeholder="厂商" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通讯协议" prop="level">
+            <el-select v-model="dataForm.simpleName" placeholder="通讯协议" style="width: 100%;" clearable />
+            <!-- <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option v-for="item in areaLevelList" :key="item.value" :label="item.name" :value="item.value" />
+            </el-select> -->
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="接入方式" prop="num">
+            <el-select v-model="dataForm.simpleName" placeholder="接入方式" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
new file mode 100644
index 0000000..9dd5b06
--- /dev/null
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -0,0 +1,171 @@
+<!--
+  Description: 产品管理-新建编辑
+  Author: 李亚光
+  Date: 2023-07-15
+ -->
+<script lang="ts" setup name="EditProduct">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  name: '', // 产品名称
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+} // 表头显示标题
+const rules: FormRules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    id: '', // 编号
+  }
+}
+
+// 初始化对话框
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'edit') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      id: row.id, // 编号
+    }
+  }
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      btnLoading.value = true
+      // addArea(areaForm.value).then((response) => {
+      //   if (response.code === 200) {
+      //     // 通知父组件刷新状态
+      //     dialogFormVisible.value = false
+      //     setTimeout(() => {
+      //       emits('refresh')
+      //     })
+      //   }
+      // }).catch((_) => { // 异常情况，loading置为false
+      // })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      // updateArea(areaForm.value).then((response) => {
+      //   if (response.code === 200) {
+      //     ElMessage({
+      //       message: '修改成功',
+      //       type: 'success',
+      //     })
+      //     dataFormRef.value.clearValidate()
+      //     setTimeout(() => {
+      //       emits('refresh')
+      //     })
+      //     dialogFormVisible.value = false
+      //   }
+      // }).catch((_) => { // 异常情况，loading置为false
+      // })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}产品`" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="产品名称" prop="areaName">
+            <el-input v-model.trim="dataForm.areaName" type="text" placeholder="产品名称" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="simpleName">
+            <el-select v-model="dataForm.simpleName" placeholder="设备类型" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="id">
+            <el-input v-model.trim="dataForm.id" type="text" placeholder="设备型号" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="厂商" prop="pName">
+            <el-select v-model="dataForm.simpleName" placeholder="厂商" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通讯协议" prop="level">
+            <el-select v-model="dataForm.simpleName" placeholder="通讯协议" style="width: 100%;" clearable />
+            <!-- <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option v-for="item in areaLevelList" :key="item.value" :label="item.name" :value="item.value" />
+            </el-select> -->
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="接入方式" prop="num">
+            <el-select v-model="dataForm.simpleName" placeholder="接入方式" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 7fcfb61..8acc8ab 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -1,3 +1,124 @@
+<!--
+  Description: 设备管理-产品管理
+  Author: 李亚光
+  Date: 2023-07-15
+ -->
+<script lang="ts" setup name="ProductManage">
+import editDialog from './components/editDialog.vue'
+// 表格数据
+const list = ref([
+])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '产品名称', value: 'name', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '设备型号', value: 'model', align: 'center' },
+  { text: '厂商', value: 'manufacturer', align: 'center' },
+  { text: '通讯协议', value: 'isEnable', align: 'center' },
+  { text: '接入方式', value: 'time', align: 'center' },
+  { text: '创建时间', value: 'time', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 新建编辑操作
+const editRef = ref()
+const editRow = (type: string, row: any) => {
+  editRef.value.initDialog(type, row)
+}
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  产品管理
+  <!-- 布局 -->
+  <app-container>
+    <!-- 新建编辑弹窗 -->
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.keywords" placeholder="产品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.keywords" placeholder="厂商" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="接入方式" clearable />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="product-manage" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary" @click="editRow('add', {})">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>

diff --git a/src/views/home/device/product/components/editDialog.vue b/src/views/home/device/product/components/editDialog.vue
new file mode 100644
index 0000000..9dd5b06
--- /dev/null
+++ b/src/views/home/device/product/components/editDialog.vue
@@ -0,0 +1,171 @@
+<!--
+  Description: 产品管理-新建编辑
+  Author: 李亚光
+  Date: 2023-07-15
+ -->
+<script lang="ts" setup name="EditProduct">
+import type { FormRules } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const emits = defineEmits(['refresh'])
+const dataFormRef = ref()
+const dialogFormVisible = ref(false) // 对话框是否显示
+const dialogStatus = ref('') // 对话框类型：create,update
+const dataForm = ref({
+  name: '', // 产品名称
+}) // 表单
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新增',
+} // 表头显示标题
+const rules: FormRules = {
+  id: [{ required: true, message: '区域编号不能为空', trigger: ['blur', 'change'] }, { type: 'number', message: '必须为数字值' }],
+  areaName: [{ required: true, message: '区域名称不能为空', trigger: ['blur', 'change'] }],
+} // 前端校验规则
+
+// 重置表单
+const resetForm = () => {
+  dataForm.value = {
+    id: '', // 编号
+  }
+}
+
+// 初始化对话框
+const initDialog = (dialogStatusValue: string, row: any) => {
+  dialogStatus.value = dialogStatusValue
+  dialogFormVisible.value = true
+  if (dialogStatus.value === 'add') { // 如果是新增，清除验证
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value.clearValidate()
+    })
+  }
+  else if (dialogStatus.value === 'edit') { // 如果是修改，将row中数据填写到输入框中
+    dataForm.value = {
+      id: row.id, // 编号
+    }
+  }
+}
+defineExpose({
+  initDialog,
+})
+
+// 新增数据
+const createData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      btnLoading.value = true
+      // addArea(areaForm.value).then((response) => {
+      //   if (response.code === 200) {
+      //     // 通知父组件刷新状态
+      //     dialogFormVisible.value = false
+      //     setTimeout(() => {
+      //       emits('refresh')
+      //     })
+      //   }
+      // }).catch((_) => { // 异常情况，loading置为false
+      // })
+    }
+  })
+}
+
+// 修改数据
+const updateData = () => {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      // updateArea(areaForm.value).then((response) => {
+      //   if (response.code === 200) {
+      //     ElMessage({
+      //       message: '修改成功',
+      //       type: 'success',
+      //     })
+      //     dataFormRef.value.clearValidate()
+      //     setTimeout(() => {
+      //       emits('refresh')
+      //     })
+      //     dialogFormVisible.value = false
+      //   }
+      // }).catch((_) => { // 异常情况，loading置为false
+      // })
+    }
+  })
+}
+
+// 保存数据
+const saveData = () => {
+  if (dialogStatus.value === 'edit') {
+    updateData()
+  }
+  else if (dialogStatus.value === 'add') {
+    createData()
+  }
+}
+const cancel = () => {
+  dialogFormVisible.value = false
+}
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="`${textMap[dialogStatus]}产品`" append-to-body>
+    <el-form ref="dataFormRef" :rules="rules" :model="dataForm" label-position="right" label-width="80px">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="产品名称" prop="areaName">
+            <el-input v-model.trim="dataForm.areaName" type="text" placeholder="产品名称" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="设备类型" prop="simpleName">
+            <el-select v-model="dataForm.simpleName" placeholder="设备类型" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备型号" prop="id">
+            <el-input v-model.trim="dataForm.id" type="text" placeholder="设备型号" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="厂商" prop="pName">
+            <el-select v-model="dataForm.simpleName" placeholder="厂商" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="通讯协议" prop="level">
+            <el-select v-model="dataForm.simpleName" placeholder="通讯协议" style="width: 100%;" clearable />
+            <!-- <el-select v-model="areaForm.level" placeholder="必选">
+              <el-option v-for="item in areaLevelList" :key="item.value" :label="item.name" :value="item.value" />
+            </el-select> -->
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="接入方式" prop="num">
+            <el-select v-model="dataForm.simpleName" placeholder="接入方式" style="width: 100%;" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="saveData">
+          确认
+        </el-button>
+        <el-button @click="cancel">
+          取消
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/home/device/product/index.vue b/src/views/home/device/product/index.vue
index 7fcfb61..8acc8ab 100644
--- a/src/views/home/device/product/index.vue
+++ b/src/views/home/device/product/index.vue
@@ -1,3 +1,124 @@
+<!--
+  Description: 设备管理-产品管理
+  Author: 李亚光
+  Date: 2023-07-15
+ -->
+<script lang="ts" setup name="ProductManage">
+import editDialog from './components/editDialog.vue'
+// 表格数据
+const list = ref([
+])
+const total = ref(0)
+// 初始展示列
+const columns = ref<any>([
+  { text: '产品名称', value: 'name', align: 'center' },
+  { text: '设备类型', value: 'deviceTypeName', align: 'center' },
+  { text: '设备型号', value: 'model', align: 'center' },
+  { text: '厂商', value: 'manufacturer', align: 'center' },
+  { text: '通讯协议', value: 'isEnable', align: 'center' },
+  { text: '接入方式', value: 'time', align: 'center' },
+  { text: '创建时间', value: 'time', align: 'center' },
+])
+// 最终展示列
+const columnsConfig = ref([])
+// 修改列
+const editColumns = (data: any) => {
+  columnsConfig.value = data
+}
+const loadingTable = ref(true)
+//  查询条件
+const listQuery = ref({
+  limit: 20,
+  offset: 1,
+})
+// 查询数据
+const fetchData = () => {
+  setTimeout(() => {
+    loadingTable.value = false
+  })
+}
+// 重置查询条件f
+const reset = () => {
+
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData()
+}
+// 新建编辑操作
+const editRef = ref()
+const editRow = (type: string, row: any) => {
+  editRef.value.initDialog(type, row)
+}
+onMounted(() => {
+  fetchData()
+})
+</script>
+
 <template>
-  产品管理
+  <!-- 布局 -->
+  <app-container>
+    <!-- 新建编辑弹窗 -->
+    <edit-dialog ref="editRef" @refresh="fetchData" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="fetchData" @clear="reset">
+      <search-item>
+        <el-input v-model="listQuery.keywords" placeholder="产品名称" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="设备类型" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.keywords" placeholder="厂商" clearable />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.keywords" placeholder="接入方式" clearable />
+      </search-item>
+    </search-area>
+    <!-- 表头标题 -->
+    <table-container
+      :is-config="true" config-title="product-manage" :columns="columns" :config-columns="columnsConfig"
+      :edit="editColumns"
+    >
+      <template #btns-right>
+        <!-- 操作 -->
+        <div>
+          <el-button type="primary" @click="editRow('add', {})">
+            新建
+          </el-button>
+        </div>
+      </template>
+      <!-- 查询结果Table显示 -->
+      <normal-table
+        :data="list" :total="total" :columns="columnsConfig" :query="listQuery" :list-loading="loadingTable"
+        @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+        <template #columns>
+          <el-table-column label="操作" align="center" width="120">
+            <template #default="scope">
+              <el-button type="primary" link size="small" @click="editRow('edit', scope.row)">
+                编辑
+              </el-button>
+              <el-button type="danger" link size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
diff --git a/src/views/home/device/type/index.vue b/src/views/home/device/type/index.vue
index c83bbc6..49ed2bd 100644
--- a/src/views/home/device/type/index.vue
+++ b/src/views/home/device/type/index.vue
@@ -43,11 +43,11 @@
   { text: '设备类型代号', value: 'deviceType', align: 'center' },
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '描述', value: 'desc', align: 'center' },
-  { text: '监控内容', value: 'monitor', align: 'center' },
-  { text: '是否需要报警上限', value: 'alarmLimit', align: 'center' },
-  { text: '是否需要报警下限', value: 'alarmLow', align: 'center' },
+  { text: '检测对象', value: 'monitor', align: 'center' },
+  // { text: '是否需要报警上限', value: 'alarmLimit', align: 'center' },
+  // { text: '是否需要报警下限', value: 'alarmLow', align: 'center' },
   { text: '是否启用', value: 'isEnable', align: 'center' },
-  { text: '最新操作时间', value: 'time', align: 'center' },
+  { text: '操作时间', value: 'time', align: 'center' },
 ])
 // 最终展示列
 const columnsConfig = ref([])