diff --git a/src/api/equipmentList/index.ts b/src/api/equipmentList/index.ts
index 474a356..dc3dceb 100644
--- a/src/api/equipmentList/index.ts
+++ b/src/api/equipmentList/index.ts
@@ -1,14 +1,17 @@
 import request from '@/utils/request';
 import type { EquipmentList, DeviceInfoForm  } from '@/api/equipmentList/types';
+import { AxiosPromise } from 'axios';
+import { DemoVO, DemoForm, DemoQuery } from '@/api/demo/demo/types';
 /**
  * 新增设备
  * @param data 设备数据
  * @returns AxiosPromise<any>
  */
-export const addEquipment = ( )=> {
+export const addEquipment = (data: DemoForm)=> {
   return request({
     url: '/device/info/add',
     method: 'post',
+    data: data
   });
 };
 
@@ -20,7 +23,7 @@ export const addEquipment = ( )=> {
 export const getDevicetList = (query: EquipmentList) => {
   return request({
     url: '/device/info/list',
-    method: 'post',
+    method: 'get',
     params: query
   });
 };
@@ -40,11 +43,10 @@ export const getDeviceInfo = (id: string | number) => {
  * 删除设备
  * @param ids 设备主键列表（Query：ids=1,2,3）
  */
-export const delDevice = (ids: Array<string | number>) => {
+export const delDevice = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/device/info/delete',
-    method: 'post',
-    params: { ids: ids.join(',') }
+    url: '/demo/demo/' + id,
+    method: 'delete',
   });
 };
 /**
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index e064f40..57492a9 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -212,7 +212,7 @@ const submitForm = () => {
       } else {
         await addDemo(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess('修改成功');
+      proxy?.$modal.msgSuccess('保存成功');
       dialog.visible = false;
       await getList();
     }
diff --git a/src/views/equipmentList/list.vue b/src/views/equipmentList/list.vue
index 7d11406..a8ce6b9 100644
--- a/src/views/equipmentList/list.vue
+++ b/src/views/equipmentList/list.vue
@@ -4,17 +4,17 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="设备编号" prop="equipmentNo">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="设备编号" prop="code">
+              <el-input v-model="queryParams.code" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="设备名称" prop="value">
-              <el-input v-model="queryParams.value" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="设备名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="监控区域" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="监控区域" prop="monitoringArea">
+              <el-input v-model="queryParams.monitoringArea" placeholder="请输入监控区域" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="设备状态" prop="testKey">
-              <el-input v-model="queryParams.testKey" placeholder="请输入设备状态" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="设备状态" prop="status">
+              <el-input v-model="queryParams.status" placeholder="请输入设备状态" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -50,14 +50,14 @@
 
       <el-table v-loading="loading" border :data="demoList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column v-if="true" label="设备编号" align="center" prop="id" />
-        <el-table-column label="设备名称" align="center" prop="deptId" />
-        <el-table-column label="监控区域" align="center" prop="userId" />
-        <el-table-column label="设备状态" align="center" prop="orderNum" />
-        <el-table-column label="设备型号" align="center" prop="testKey" />
-        <el-table-column label="固件版本" align="center" prop="value" />
-        <el-table-column label="是否绘制区域" align="center" prop="value" />
-        <el-table-column label="绑定时间" align="center" prop="value" />
+        <el-table-column v-if="true" label="设备编号" align="center" prop="code" />
+        <el-table-column label="设备名称" align="center" prop="name" />
+        <el-table-column label="监控区域" align="center" prop="monitoringArea" />
+        <el-table-column label="设备状态" align="center" prop="status" />
+        <el-table-column label="设备型号" align="center" prop="model" />
+        <el-table-column label="固件版本" align="center" prop="id" />
+        <el-table-column label="是否绘制区域" align="center" prop="isDrawArea" />
+        <el-table-column label="绑定时间" align="center" prop="isDelete" />
         <el-table-column width="400" label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
@@ -73,21 +73,15 @@
     </el-card>
     <!-- 添加或修改测试单对话框 -->
     <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
-      <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+      <el-form ref="demoFormRef" :model="form" :rules="rules" >
+        <el-form-item label="设备编号：" prop="code">
+          <el-input v-model="form.code" placeholder="请输入设备编号" />
         </el-form-item>
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        <el-form-item label="设备名称：" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设备名称" />
         </el-form-item>
-        <el-form-item label="排序号" prop="orderNum">
-          <el-input v-model="form.orderNum" placeholder="请输入排序号" />
-        </el-form-item>
-        <el-form-item label="key键" prop="testKey">
-          <el-input v-model="form.testKey" placeholder="请输入key键" />
-        </el-form-item>
-        <el-form-item label="值" prop="value">
-          <el-input v-model="form.value" placeholder="请输入值" />
+        <el-form-item label="监控区域：" prop="monitoringArea">
+          <el-input v-model="form.monitoringArea" placeholder="请输入监控区域" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -103,6 +97,8 @@
 <script setup name="Demo" lang="ts">
 import { addEquipment, getDevicetList, getDeviceInfo, delDevice, actDevice, updateDeviceInfo } from '@/api/equipmentList/index';
 import { EquipmentList, DeviceInfoForm } from '@/api/equipmentList/types';
+import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo';
+import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -123,13 +119,11 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
-const initFormData: DemoForm = {
+const initFormData = {
   id: undefined,
-  deptId: undefined,
-  userId: undefined,
-  orderNum: undefined,
-  testKey: undefined,
-  value: undefined
+  code: undefined,
+  name: undefined,
+  monitoringArea: undefined,
 };
 const data = reactive({
   form: { ...initFormData },
@@ -142,12 +136,9 @@ const data = reactive({
     status: undefined
   },
   rules: {
-    id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
-    deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
-    userId: [{ required: true, message: '用户id不能为空', trigger: 'blur' }],
-    orderNum: [{ required: true, message: '排序号不能为空', trigger: 'blur' }],
-    testKey: [{ required: true, message: 'key键不能为空', trigger: 'blur' }],
-    value: [{ required: true, message: '值不能为空', trigger: 'blur' }]
+    code: [{ required: true, message: '请输入设备编号', trigger: 'blur' }],
+    name: [{ required: true, message: '请输入设备名称', trigger: 'blur' }],
+    monitoringArea: [{ required: true, message: '请输入监控区域', trigger: 'blur' }]
   }
 });
 
@@ -197,44 +188,44 @@ const handleSelectionChange = (selection: any) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = '添加测试单';
+  dialog.title = '添加设备';
 };
 
 /** 修改按钮操作 */
-// const handleUpdate = async (row?: any) => {
-//   reset();
-//   const _id = row?.id || ids.value[0];
-//   const res = await getDemo(_id);
-//   Object.assign(form.value, res.data);
-//   dialog.visible = true;
-//   dialog.title = '修改测试单';
-// };
+const handleUpdate = async (row?: any) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getDeviceInfo(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改设备';
+};
 
-// /** 提交按钮 */
-// const submitForm = () => {
-//   demoFormRef.value?.validate(async (valid: boolean) => {
-//     if (valid) {
-//       buttonLoading.value = true;
-//       if (form.value.id) {
-//         await updateDemo(form.value).finally(() => (buttonLoading.value = false));
-//       } else {
-//         await addDemo(form.value).finally(() => (buttonLoading.value = false));
-//       }
-//       proxy?.$modal.msgSuccess('修改成功');
-//       dialog.visible = false;
-//       await getList();
-//     }
-//   });
-// };
+/** 提交按钮 */
+const submitForm = () => {
+  demoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceInfo(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addEquipment(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('修改成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
 
-// /** 删除按钮操作 */
-// const handleDelete = async (row?: DemoVO) => {
-//   const _ids = row?.id || ids.value;
-//   await proxy?.$modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-//   await delDemo(_ids);
-//   proxy?.$modal.msgSuccess('删除成功');
-//   await getList();
-// };
+/** 删除按钮操作 */
+const handleDelete = async (row?: DemoVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delDevice(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {