要提交的变更：

	修改：     src/api/device/index.ts
	新文件：   src/views/device/category/component/edit.vue
	新文件：   src/views/device/category/index.vue
	新文件：   src/views/device/instance/component/edit.vue
	修改：     src/views/device/instance/index.vue
	修改：     src/views/device/product/component/editPro.vue
	修改：     src/views/device/product/index.vue

src/api/device/index.ts

@@ -2,11 +2,26 @@ import { get, post, del, put } from '/@/utils/request';
 
 export default {
   product: {
-    getList: (params: object) => get('/product/list', params),
+    getList: (params: object) => get('/product/page_list', params),
     getRole: (id: number) => get('/system/role/getInfoById', { id }),
     addRole: (data: object) => post('/system/role/add', data),
     deleteRole: (id: number) => del('/system/role/delInfoById', { id }),
     editRole: (data: object) => put('/system/role/edit', data)
   },
+  category:{
+    getList: (params: object) => get('/product/category/list', params),
+    add: (data: object) => post('/product/category/add', data),
+    edit: (data: object) => put('/product/category/edit', data),
+    del: (id: number) => del('/product/category/del', { id }),
+  },
+  instance:{
+    getList: (params: object) => get('/product/device/page_list', params),
+    add: (data: object) => post('/product/category/add', data),
+    edit: (data: object) => put('/product/category/edit', data),
+    del: (id: number) => del('/product/category/del', { id }),
+  },
+  dept: {
+    getList: (params: object) => get('/system/dept/tree', params),
+  },
   
 }

src/views/device/category/component/edit.vue

@@ -0,0 +1,159 @@
+<template>
+  <div class="system-edit-dept-container">
+    <el-dialog :title="(ruleForm.id?'修改':'添加')+'分类'" v-model="isShowDialog" width="769px">
+      <el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
+        <el-row :gutter="35">
+        
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+            <el-form-item label="上级分类">
+              <el-cascader :options="deptData" :props="{ checkStrictly: true,emitPath: false, value: 'id', label: 'name' }" placeholder="请选择分类" clearable class="w100" v-model="ruleForm.parentId">
+                <template #default="{ node, data }">
+                  <span>{{ data.name }}</span>
+                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                </template>
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+            <el-form-item label="分类名称" prop="name">
+              <el-input v-model="ruleForm.name" placeholder="请输入分类名称" clearable></el-input>
+            </el-form-item>
+          </el-col>
+           <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+            <el-form-item label="分类标识" prop="key">
+              <el-input v-model="ruleForm.key" placeholder="请输入分类名称" clearable></el-input>
+            </el-form-item>
+          </el-col>
+         <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+            <el-form-item label="描述">
+              <el-input v-model="ruleForm.desc" type="textarea" placeholder="请输入描述" maxlength="150"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="onCancel" size="default">取 消</el-button>
+          <el-button type="primary" @click="onSubmit" size="default">{{ruleForm.id?'修 改':'添 加'}}</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref } from 'vue';
+import api from '/@/api/device';
+import { phoneValidate } from '/@/utils/validator';
+import { ElMessage } from 'element-plus';
+
+interface RuleFormState {
+	id?: number;
+	parentId: number;
+	name: string;
+	key: string;
+	desc: string;
+	children?: RuleFormState[];
+}
+interface DeptSate {
+	isShowDialog: boolean;
+	ruleForm: RuleFormState;
+	deptData: RuleFormState[];
+	orgData: any[];
+	rules: object;
+}
+
+const baseForm: RuleFormState = {
+	parentId: 0, // 上级分类
+	name: '', // 分类名称
+	key: '',
+	desc: '',
+};
+
+export default defineComponent({
+	name: 'deviceEditCate',
+	setup(prop, { emit }) {
+		const formRef = ref<HTMLElement | null>(null);
+		const state = reactive<DeptSate>({
+			isShowDialog: false,
+			ruleForm: {
+				...baseForm,
+			},
+			deptData: [], // 分类数据
+			orgData: [], // 组织数据
+			rules: {
+				name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
+				key: [{ required: true, message: '分类标识不能为空', trigger: 'blur' }],
+			},
+		});
+
+		// 打开弹窗
+		const openDialog = (row?: RuleFormState | number) => {
+			resetForm();
+			api.category.getList({ status: 1 }).then((res: any) => {
+				state.deptData = res.category || [];
+			});
+
+			
+			if (row && typeof row === 'object') {
+				state.ruleForm = row;
+			} else if (row && typeof row === 'number') {
+				state.ruleForm.parentId = row;
+			}
+			state.isShowDialog = true;
+		};
+		// 关闭弹窗
+		const closeDialog = () => {
+			state.isShowDialog = false;
+		};
+		// 取消
+		const onCancel = () => {
+			closeDialog();
+		};
+		// 新增
+		const onSubmit = () => {
+			console.log(state.ruleForm.parentId);
+			const formWrap = unref(formRef) as any;
+			if (!formWrap) return;
+			formWrap.validate((valid: boolean) => {
+				if (valid) {
+					console.log(state.ruleForm);
+					console.log(state.ruleForm.parentId);
+					if (!state.ruleForm.parentId) {
+						state.ruleForm.parentId = 0;
+					}
+					console.log(state.ruleForm.parentId);
+					if (!state.ruleForm.id) {
+						//添加
+						api.category.add(state.ruleForm).then(() => {
+							ElMessage.success('分类添加成功');
+							closeDialog(); // 关闭弹窗
+							emit('getCateList');
+						});
+					} else {
+						//修改
+						api.category.edit(state.ruleForm).then(() => {
+							ElMessage.success('分类修改成功');
+							closeDialog(); // 关闭弹窗
+							emit('getCateList');
+						});
+					}
+				}
+			});
+		};
+		const resetForm = () => {
+			state.ruleForm = {
+				...baseForm,
+			};
+		};
+		return {
+			openDialog,
+			closeDialog,
+			onCancel,
+			onSubmit,
+			formRef,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/views/device/category/index.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="system-dept-container">
+    <el-card shadow="hover">
+      <div class="system-dept-search mb15">
+        <el-form :inline="true">
+          <el-form-item label="分类名称">
+            <el-input size="default" v-model="tableData.param.name" placeholder="请输入分类名称" class="w-50 m-2" clearable />
+          </el-form-item>
+         
+          <el-form-item>
+            <el-button size="default" type="primary" class="ml10" @click="getCateList">
+              <el-icon>
+                <ele-Search />
+              </el-icon>
+              查询
+            </el-button>
+            <el-button size="default" type="success" class="ml10" @click="onOpenAdd">
+              <el-icon>
+                <ele-FolderAdd />
+              </el-icon>
+              新增分类
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="tableData.data" style="width: 100%" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+        <el-table-column prop="name" label="分类名称" show-overflow-tooltip> </el-table-column>
+        
+       
+        <el-table-column prop="createdAt" label="创建时间" align="center" min-width="180"></el-table-column>
+        <el-table-column label="操作" align="center" width="140">
+          <template #default="scope">
+            <el-button size="small" type="text" @click="onOpenAdd(scope.row)">新增</el-button>
+            <el-button size="small" text type="warning" @click="onOpenEdit(scope.row)">修改</el-button>
+            <el-button size="small" text type="danger" @click="onTabelRowDel(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <EditCate ref="editDeptRef" @getCateList="getCateList" />
+  </div>
+</template>
+
+<script lang="ts">
+import { ref, toRefs, reactive, onMounted, defineComponent } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import EditCate from './component/edit.vue';
+import api from '/@/api/device';
+
+// 定义接口来定义对象的类型
+interface TableDataRow {
+	id: number;
+	parentId: number;
+	name: string;
+	status: number;
+	orderNum: number;
+	leader: string;
+	children?: TableDataRow[];
+}
+interface TableDataState {
+	tableData: {
+		data: Array<TableDataRow>;
+		loading: boolean;
+		param: {
+			name: string;
+			status: number;
+		};
+	};
+}
+
+export default defineComponent({
+	name: 'deviceCate',
+	components: { EditCate },
+	setup() {
+		const editDeptRef = ref();
+		const state = reactive<TableDataState>({
+			tableData: {
+				data: [],
+				loading: false,
+				param: {
+					name: '',
+					status: -1,
+				},
+			},
+		});
+		// 初始化表格数据
+		const initTableData = () => {
+			getCateList();
+		};
+		const getCateList = () => {
+			api.category.getList(state.tableData.param).then((res: any) => {
+				state.tableData.data = res.category;
+			});
+		};
+		// 打开新增菜单弹窗
+		const onOpenAdd = (row?: TableDataRow) => {
+			editDeptRef.value.openDialog(row?.id);
+		};
+		// 打开编辑菜单弹窗
+		const onOpenEdit = (row: TableDataRow) => {
+			editDeptRef.value.openDialog(row);
+		};
+		// 删除当前行
+		const onTabelRowDel = (row: TableDataRow) => {
+			ElMessageBox.confirm(`此操作将永久删除分类：${row.name}, 是否继续?`, '提示', {
+				confirmButtonText: '删除',
+				cancelButtonText: '取消',
+				type: 'warning',
+			}).then(() => {
+				api.category.del(row.id).then(() => {
+					ElMessage.success('删除成功');
+					getCateList();
+				});
+			});
+		};
+		// 页面加载时
+		onMounted(() => {
+			initTableData();
+		});
+		return {
+			editDeptRef,
+			getCateList,
+			onOpenAdd,
+			onOpenEdit,
+			onTabelRowDel,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/views/device/instance/component/edit.vue

@@ -0,0 +1,129 @@
+<template>
+	<div class="system-edit-dic-container">
+		<el-dialog :title="(ruleForm.dictId!==0?'修改':'添加')+'产品'" v-model="isShowDialog" width="769px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+        <el-form-item label="产品名称" prop="dictName">
+          <el-input v-model="ruleForm.dictName" placeholder="请输入产品名称" />
+        </el-form-item>
+      
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="ruleForm.status">
+            <el-radio :label="1" >启用</el-radio>
+            <el-radio :label="0" >禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="ruleForm.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.dictId!==0?'修 改':'添 加'}}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
+import api from '/@/api/device';
+import {ElMessage} from "element-plus";
+interface RuleFormState {
+  id:number;
+  name:string;
+  dictType:string;
+  status:number;
+  remark:string;
+}
+interface DicState {
+	isShowDialog: boolean;
+	ruleForm: RuleFormState;
+  rules:{}
+}
+
+export default defineComponent({
+	name: 'deviceEditPro',
+	setup(prop,{emit}) {
+    const formRef = ref<HTMLElement | null>(null);
+		const state = reactive<DicState>({
+			isShowDialog: false,
+			ruleForm: {
+        dictId:0,
+        dictName:'',
+        dictType:'',
+        status:1,
+        remark:''
+			},
+      rules: {
+        name: [
+          { required: true, message: "产品名称不能为空", trigger: "blur" }
+        ]
+      }
+		});
+		// 打开弹窗
+		const openDialog = (row: RuleFormState|null) => {
+      resetForm();
+      if (row){
+        // api.dict.getType(row.dictId).then((res:any)=>{
+        //   state.ruleForm = res.data.dictType
+        // })
+        state.ruleForm = row;
+      }
+			state.isShowDialog = true;
+		};
+    const resetForm = ()=>{
+      state.ruleForm = {
+        dictId:0,
+        dictName:'',
+        dictType:'',
+        status:1,
+        remark:''
+      }
+    };
+		// 关闭弹窗
+		const closeDialog = () => {
+			state.isShowDialog = false;
+		};
+		// 取消
+		const onCancel = () => {
+			closeDialog();
+		};
+		// 新增
+		const onSubmit = () => {
+      const formWrap = unref(formRef) as any;
+      if (!formWrap) return;
+      formWrap.validate((valid: boolean) => {
+        if (valid) {
+          if(state.ruleForm.dictId!==0){
+            //修改
+            // api.dict.editType(state.ruleForm).then(()=>{
+            //   ElMessage.success('产品类型修改成功');
+            //   closeDialog(); // 关闭弹窗
+            //   emit('typeList')
+            // })
+          }else{
+            //添加
+            // api.dict.addType(state.ruleForm).then(()=>{
+            //   ElMessage.success('产品类型添加成功');
+            //   closeDialog(); // 关闭弹窗
+            //   emit('typeList')
+            // })
+          }
+        }
+      });
+		};
+
+
+		return {
+			openDialog,
+			closeDialog,
+			onCancel,
+			onSubmit,
+      formRef,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/views/device/instance/index.vue

@@ -1,10 +1,212 @@
 <template>
-	<div class="home-container"> instance
-	</div>
+  <div class="system-dic-container">
+    <el-card shadow="hover">
+      <div class="system-user-search mb15">
+        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+          <el-form-item label="设备名称" prop="name">
+            <el-input v-model="tableData.param.name" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+          </el-form-item>
+		  <el-form-item label="设备标识" prop="key">
+            <el-input v-model="tableData.param.key" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+          </el-form-item>
+          
+          <el-form-item label="状态" prop="status" style="width: 200px;">
+            <el-select v-model="tableData.param.status" placeholder="状态" clearable size="default" style="width: 240px">
+              <el-option label="在线" :value="2" />
+              <el-option label="离线" :value="1" />
+              <el-option label="未启用" :value="0" />
+            </el-select>
+          </el-form-item>
+        
+          <el-form-item label="创建时间" prop="dateRange">
+            <el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="default" type="primary" class="ml10" @click="typeList">
+              <el-icon>
+                <ele-Search />
+              </el-icon>
+              查询
+            </el-button>
+            <el-button size="default" @click="resetQuery(queryRef)">
+              <el-icon>
+                <ele-Refresh />
+              </el-icon>
+              重置
+            </el-button>
+            <el-button size="default" type="success" class="ml10" @click="onOpenAddDic">
+              <el-icon>
+                <ele-FolderAdd />
+              </el-icon>
+              新增设备
+            </el-button>
+            <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
+              <el-icon>
+                <ele-Delete />
+              </el-icon>
+              删除删除
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="ID" align="center" prop="id" width="80" />
+        <el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" />
+        <el-table-column label="设备标识" prop="key" :show-overflow-tooltip="true" />
+        <el-table-column label="产品名称" prop="productName" :show-overflow-tooltip="true" />
+        <el-table-column label="部门名称" prop="deptName" :show-overflow-tooltip="true" />
+       
+        
+        <el-table-column prop="status" label="状态" width="120" align="center">
+          <template #default="scope">
+            <el-tag type="info" size="small" v-if="scope.row.status==1">离线</el-tag>
+            <el-tag type="success" size="small" v-if="scope.row.status==2">在线</el-tag>
+            <el-tag type="info" size="small" v-if="scope.row.status==0">未启用</el-tag>
+          </template>
+        </el-table-column>
+         <el-table-column prop="registryTime" label="激活时间" align="center" width="180"></el-table-column> 
+         <el-table-column prop="lastOnlineTime" label="最后上线时间" align="center" width="180"></el-table-column> 
+        <el-table-column label="操作" width="100" align="center">
+          <template #default="scope">
+            <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)">修改</el-button>
+            <el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="tableData.total>0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
+    </el-card>
+    <EditDic ref="editDicRef" @typeList="typeList" />
+  </div>
 </template>
 
-<script lang="ts" setup>
-</script>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import EditDic from './component/edit.vue';
+import api from '/@/api/device';
+
+// 定义接口来定义对象的类型
+interface TableDataRow {
+	id: number;
+	name: string;
+	key: string;
+	status: number;
+	desc: string;
+	createBy: string;
+}
+interface TableDataState {
+	ids: number[];
+	tableData: {
+		data: Array<TableDataRow>;
+		total: number;
+		loading: boolean;
+		param: {
+			pageNum: number;
+			pageSize: number;
+			name: string;
+			key: string;
+			status: string;
+			dateRange: string[];
+		};
+	};
+}
 
-<style scoped lang="scss">
-</style>
+export default defineComponent({
+	name: 'deviceInstance',
+	components: { EditDic },
+	setup() {
+		const addDicRef = ref();
+		const editDicRef = ref();
+		const queryRef = ref();
+		const state = reactive<TableDataState>({
+			ids: [],
+			tableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					pageSize: 10,
+					dictName: '',
+					dictType: '',
+					status: '',
+					dateRange: [],
+				},
+			},
+		});
+		// 初始化表格数据
+		const initTableData = () => {
+			typeList();
+		};
+		const typeList = () => {
+			api.instance.getList(state.tableData.param).then((res: any) => {
+				console.log(res);
+				state.tableData.data = res.device;
+				state.tableData.total = res.total;
+			});
+		};
+		// 打开新增产品弹窗
+		const onOpenAddDic = () => {
+			editDicRef.value.openDialog();
+		};
+		// 打开修改产品弹窗
+		const onOpenEditDic = (row: TableDataRow) => {
+			editDicRef.value.openDialog(row);
+		};
+		// 删除产品
+		const onRowDel = (row: TableDataRow) => {
+			let msg = '你确定要删除所选数据？';
+			let ids: number[] = [];
+			if (row) {
+				msg = `此操作将永久删除用户：“${row.name}”，是否继续?`;
+				ids = [row.dictId];
+			} else {
+				ids = state.ids;
+			}
+			if (ids.length === 0) {
+				ElMessage.error('请选择要删除的数据。');
+				return;
+			}
+			ElMessageBox.confirm(msg, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					api.instance.del(ids).then(() => {
+						ElMessage.success('删除成功');
+						typeList();
+					});
+				})
+				.catch(() => {});
+		};
+		// 页面加载时
+		onMounted(() => {
+			initTableData();
+		});
+		/** 重置按钮操作 */
+		const resetQuery = (formEl: FormInstance | undefined) => {
+			if (!formEl) return;
+			formEl.resetFields();
+			typeList();
+		};
+		// 多选框选中数据
+		const handleSelectionChange = (selection: TableDataRow[]) => {
+			state.ids = selection.map((item) => item.dictId);
+		};
+		return {
+			addDicRef,
+			editDicRef,
+			queryRef,
+			onOpenAddDic,
+			onOpenEditDic,
+			onRowDel,
+			typeList,
+			resetQuery,
+			handleSelectionChange,
+			...toRefs(state),
+		};
+	},
+});
+</script>

src/views/device/product/component/editPro.vue

@@ -2,9 +2,40 @@
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.dictId!==0?'修改':'添加')+'产品'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
-        <el-form-item label="产品名称" prop="dictName">
-          <el-input v-model="ruleForm.dictName" placeholder="请输入产品名称" />
+        <el-form-item label="产品名称" prop="name">
+          <el-input v-model="ruleForm.name" placeholder="请输入产品名称" />
         </el-form-item>
+        <el-form-item label="产品图片" prop="imageUrl">
+        <el-upload
+            class="avatar-uploader"
+            action="http://zhgy.sagoo.cn:8899/api/v1/common/singleImg"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+            <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+          </el-upload>
+        </el-form-item>
+         <el-form-item label="产品标识" prop="key">
+          <el-input v-model="ruleForm.key" placeholder="请输入产品标识" />
+        </el-form-item>
+        <el-form-item label="产品分类">
+              <el-cascader :options="cateData" :props="{ checkStrictly: true,emitPath: false, value: 'id', label: 'name' }" placeholder="请选择分类" clearable class="w100" v-model="ruleForm.parentId">
+                <template #default="{ node, data }">
+                  <span>{{ data.name }}</span>
+                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                </template>
+              </el-cascader>
+            </el-form-item>
+             <el-form-item label="所属部门">
+              <el-cascader :options="deptData" :props="{ checkStrictly: true,emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择所属部门" clearable class="w100" v-model="ruleForm.deptId">
+                <template #default="{ node, data }">
+                  <span>{{ data.deptName }}</span>
+                  <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+                </template>
+              </el-cascader>
+            </el-form-item>
       
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="ruleForm.status">
@@ -29,17 +60,22 @@
 <script lang="ts">
 import { reactive, toRefs, defineComponent,ref, unref } from 'vue';
 import api from '/@/api/device';
-import {ElMessage} from "element-plus";
+import {ElMessage,UploadProps} from "element-plus";
+import { Plus } from 'element-plus/icons-vue'
+
 interface RuleFormState {
   id:number;
   name:string;
   dictType:string;
   status:number;
   remark:string;
+  imageUrl:string;
 }
 interface DicState {
 	isShowDialog: boolean;
 	ruleForm: RuleFormState;
+  cateData: RuleFormState[];
+  deptData: RuleFormState[];
   rules:{}
 }
 
@@ -49,6 +85,9 @@ export default defineComponent({
     const formRef = ref<HTMLElement | null>(null);
 		const state = reactive<DicState>({
 			isShowDialog: false,
+    	cateData: [], // 分类数据
+    	deptData: [], // 分类数据
+
 			ruleForm: {
         dictId:0,
         dictName:'',
@@ -59,16 +98,51 @@ export default defineComponent({
       rules: {
         name: [
           { required: true, message: "产品名称不能为空", trigger: "blur" }
+        ],
+         key: [
+          { required: true, message: "产品标识不能为空", trigger: "blur" }
         ]
       }
 		});
+
+    const handleAvatarSuccess: UploadProps['onSuccess'] = (
+      response,
+      uploadFile
+    ) => {
+      console.log(response);
+      console.log(11111111);
+      console.log(uploadFile);
+      imageUrl.value = URL.createObjectURL(uploadFile.raw!)
+    }
+
+    const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+      if (rawFile.type !== 'image/jpeg') {
+        ElMessage.error('Avatar picture must be JPG format!')
+        return false
+      } else if (rawFile.size / 1024 / 1024 > 2) {
+        ElMessage.error('Avatar picture size can not exceed 2MB!')
+        return false
+      }
+      return true
+    }
 		// 打开弹窗
 		const openDialog = (row: RuleFormState|null) => {
       resetForm();
+        api.category.getList({ status: 1 }).then((res: any) => {
+          state.cateData = res.category || [];
+        });
+        api.dept.getList({ status: -1 }).then((res: any) => {
+          console.log(res)
+          
+          state.deptData = res || [];
+        });
       if (row){
         // api.dict.getType(row.dictId).then((res:any)=>{
         //   state.ruleForm = res.data.dictType
         // })
+
+      
+
         state.ruleForm = row;
       }
 			state.isShowDialog = true;
@@ -118,6 +192,8 @@ export default defineComponent({
 
 		return {
 			openDialog,
+      beforeAvatarUpload,
+      beforeAvatarUpload,
 			closeDialog,
 			onCancel,
 			onSubmit,
@@ -127,3 +203,34 @@ export default defineComponent({
 	},
 });
 </script>
+
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>

src/views/device/product/index.vue

@@ -41,7 +41,7 @@
               <el-icon>
                 <ele-Delete />
               </el-icon>
-              删除删除
+              删除
             </el-button>
           </el-form-item>
         </el-form>
@@ -51,6 +51,8 @@
         <el-table-column label="ID" align="center" prop="id" width="80" />
         <el-table-column label="产品名称" prop="name" :show-overflow-tooltip="true" />
         <el-table-column label="产品标识" prop="key" :show-overflow-tooltip="true" />
+        <el-table-column label="分类名称" prop="categoryName" :show-overflow-tooltip="true" />
+        <el-table-column label="部门名称" prop="deptName" :show-overflow-tooltip="true" />
         <el-table-column label="消息协议" prop="messageProtocol" :show-overflow-tooltip="true" />
         <el-table-column label="传输协议" prop="transportProtocol" :show-overflow-tooltip="true" />
         <el-table-column label="设备类型" prop="deviceType" :show-overflow-tooltip="true" />
@@ -78,7 +80,7 @@
 <script lang="ts">
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
-import EditDic from './component/editDic.vue';
+import EditDic from './component/editPro.vue';
 import api from '/@/api/device';
 
 // 定义接口来定义对象的类型