diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index da1bc1670821c4b5458f871655d5a386e37289e9..10d8b8e097358180913ed9c6474aba1d6356cd68 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -32,18 +32,18 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            <el-button v-hasPermi="['demo:demo:add']" type="primary" plain icon="Plus" @click="handleAdd">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改</el-button>
+            <el-button v-hasPermi="['demo:demo:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">修改 </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button v-hasPermi="['demo:demo:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              >删除</el-button
-            >
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+            <el-button v-hasPermi="['demo:demo:export']" type="warning" plain icon="Download" @click="handleExport"> 导出 </el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
         </el-row>
@@ -106,78 +106,23 @@ import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const demoList = ref<DemoVO[]>([]);
-const buttonLoading = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
+// =========== 查询相关 ===========
 const queryFormRef = ref<ElFormInstance>();
-const demoFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: DemoForm = {
-  id: undefined,
+const showSearch = ref(true);
+const loading = ref(true);
+const queryParams = reactive<DemoQuery>({
+  pageNum: 1,
+  pageSize: 10,
   deptId: undefined,
   userId: undefined,
   orderNum: undefined,
   testKey: undefined,
   value: undefined
-};
-const data = reactive<PageData<DemoForm, DemoQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    deptId: undefined,
-    userId: undefined,
-    orderNum: undefined,
-    testKey: undefined,
-    value: 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' }]
-  }
 });
 
-const { queryParams, form, rules } = toRefs(data);
-
-/** 查询测试单列表 */
-const getList = async () => {
-  loading.value = true;
-  const res = await listDemo(queryParams.value);
-  demoList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
-};
-
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  demoFormRef.value?.resetFields();
-};
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.value.pageNum = 1;
+  queryParams.pageNum = 1;
   getList();
 };
 
@@ -187,13 +132,95 @@ const resetQuery = () => {
   handleQuery();
 };
 
+// =========== 表格数据相关 ===========
+const demoList = ref<DemoVO[]>([]);
+const total = ref(0);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+
+/** 查询测试单列表 */
+const getList = async () => {
+  loading.value = true;
+  try {
+    const res = await listDemo(queryParams);
+    demoList.value = res.rows;
+    total.value = res.total;
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'demo/demo/export',
+    {
+      ...queryParams
+    },
+    `demo_${new Date().getTime()}.xlsx`
+  );
+};
+
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: DemoVO[]) => {
   ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
+  single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
 
+/** 删除按钮操作 */
+const handleDelete = async (row?: DemoVO) => {
+  const _ids = row?.id || ids.value;
+  try {
+    await proxy?.$modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？');
+    await delDemo(_ids);
+    proxy?.$modal.msgSuccess('删除成功');
+    await getList();
+  } finally {
+    loading.value = false;
+  }
+};
+
+// =========== 表单相关 ===========
+// 初始表单数据
+const initFormData: DemoForm = {
+  id: undefined,
+  deptId: undefined,
+  userId: undefined,
+  orderNum: undefined,
+  testKey: undefined,
+  value: undefined
+};
+
+const demoFormRef = ref<ElFormInstance>();
+const buttonLoading = ref(false);
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+const form = reactive<DemoForm>({ ...initFormData });
+const rules = reactive<ElFormRules>({
+  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' }]
+});
+
+/** 表单重置 */
+const reset = () => {
+  Object.assign(form, initFormData);
+  demoFormRef.value?.resetFields();
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
@@ -206,7 +233,7 @@ const handleUpdate = async (row?: DemoVO) => {
   reset();
   const _id = row?.id || ids.value[0];
   const res = await getDemo(_id);
-  Object.assign(form.value, res.data);
+  Object.assign(form, res.data);
   dialog.visible = true;
   dialog.title = '修改测试单';
 };
@@ -216,10 +243,10 @@ 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));
+      if (form.id) {
+        await updateDemo(form).finally(() => (buttonLoading.value = false));
       } else {
-        await addDemo(form.value).finally(() => (buttonLoading.value = false));
+        await addDemo(form).finally(() => (buttonLoading.value = false));
       }
       proxy?.$modal.msgSuccess('修改成功');
       dialog.visible = false;
@@ -228,26 +255,7 @@ const submitForm = () => {
   });
 };
 
-/** 删除按钮操作 */
-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 handleExport = () => {
-  proxy?.download(
-    'demo/demo/export',
-    {
-      ...queryParams.value
-    },
-    `demo_${new Date().getTime()}.xlsx`
-  );
-};
-
+// 页面加载时获取列表数据
 onMounted(() => {
   getList();
 });