bug调整

src/views/systemManage/resourceManage.vue

@@ -4,7 +4,11 @@
       <div class="header-left">
         <el-form :inline="true" :model="searchForm">
           <el-form-item label="关键字查询">
-                        <el-input v-model="searchForm.name" clearable @keydown.enter="handleSearch" />
+            <el-input
+              v-model="searchForm.name"
+              clearable
+              @keydown.enter="handleSearch"
+            />
           </el-form-item>
           <el-form-item label="数据类型查询">
             <el-select v-model="searchForm.type">
@@ -40,31 +44,56 @@
         @current-page-change="handleCurrentPageChange"
       >
         <template #operations="{ row, index }">
-                    <el-button link type="primary" size="small" @click="handleEdit(row, index)">
+          <el-button
+            link
+            type="primary"
+            size="small"
+            @click="handleEdit(row, index)"
+          >
             编辑
           </el-button>
-                    <el-button link type="danger" size="small" @click="handleDelete(row, index)">
+          <el-button
+            link
+            type="danger"
+            size="small"
+            @click="handleDelete(row, index)"
+          >
             删除
           </el-button>
         </template>
       </common-table>
     </div>
-        <el-dialog class="add-dialog"
+    <el-dialog
+      class="add-dialog"
       v-model="dialogVisible"
       :title="dialogTitle"
       width="600px"
       @close="cancelResourceForm"
-            :close-on-click-modal="false" :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <el-form
+        :model="resourceFormData"
+        ref="resourceForm"
+        :rules="resourceRules"
+        label-width="100"
       >
-            <el-form :model="resourceFormData" ref="resourceForm" :rules="resourceRules" label-width="100">
         <el-form-item label="名称" prop="name">
-                    <el-input v-model="resourceFormData.name" placeholder="请输入资源库名称" />
+          <el-input
+            v-model="resourceFormData.name"
+            placeholder="请输入资源库名称"
+          />
         </el-form-item>
         <el-form-item label="唯一标识" prop="key">
-                    <el-input v-model="resourceFormData.key" placeholder="请输入唯一标识" />
+          <el-input
+            v-model="resourceFormData.key"
+            placeholder="请输入唯一标识"
+          />
         </el-form-item>
         <el-form-item label="类型" prop="type">
-                    <el-select v-model="resourceFormData.type" placeholder="请选择数据类型"
+          <el-select
+            v-model="resourceFormData.type"
+            placeholder="请选择数据类型"
             :disabled="!!resourceFormData.id"
           >
             <el-option label="平级数据" value="1"></el-option>
@@ -78,7 +107,7 @@
               ref="treeRef"
               :data="treeData"
               node-key="key"
-                            :props="{label: 'name'}"
+              :props="{ label: 'name' }"
               render-after-expand
             >
               <template #default="{ node, data }">
@@ -93,9 +122,12 @@
                     </span>
                     <template #dropdown>
                       <el-dropdown-menu>
-                                            <el-dropdown-item @click="nodeAddChild(data)" v-if="resourceFormData.type == 2">
+                        <el-dropdown-item
+                          @click="nodeAddChild(data)"
+                          v-if="resourceFormData.type == 2"
+                        >
                           <i class="iconfont icon-tianjia"></i>
-                                                添加子部门
+                          添加子节点
                         </el-dropdown-item>
                         <el-dropdown-item @click="nodeEdit(data)">
                           <i class="iconfont icon-bianji"></i>
@@ -126,14 +158,23 @@
       :title="listDialogTitle"
       width="600px"
       @close="cancelListForm"
-            :close-on-click-modal="false" :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <el-form
+        :model="listFormData"
+        ref="listForm"
+        :rules="listRules"
+        label-width="100"
       >
-            <el-form :model="listFormData" ref="listForm" :rules="listRules" label-width="100">
         <el-form-item label="名称" prop="name">
-                    <el-input v-model="listFormData.name" placeholder="请输入资源库名称" />
+          <el-input
+            v-model="listFormData.name"
+            placeholder="请输入资源库名称"
+          />
         </el-form-item>
         <el-form-item label="唯一标识" prop="key">
-                    <el-input v-model="listFormData.key" placeholder="请输入唯一标识"/>
+          <el-input v-model="listFormData.key" placeholder="请输入唯一标识" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -147,19 +188,19 @@
 </template>
 
 <script setup>
-    import { ref, reactive, onMounted, getCurrentInstance, computed } from "vue";
-    import { ElMessage, ElMessageBox } from "element-plus";
-    import CommonTable from "@/components/common/commonTable.vue";
+import { ref, reactive, onMounted, getCurrentInstance, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import CommonTable from "@/components/common/commonTable.vue";
 
-    const { proxy } = getCurrentInstance();
-    const loading = ref(false);
-    const tableData = ref([]);
-    const total = ref(0);
-    const currentPage = ref(1);
-    const pageSize = ref(10);
-    const searchForm = ref({});
-    // 表格列配置
-    const tableColumns = [
+const { proxy } = getCurrentInstance();
+const loading = ref(false);
+const tableData = ref([]);
+const total = ref(0);
+const currentPage = ref(1);
+const pageSize = ref(10);
+const searchForm = ref({});
+// 表格列配置
+const tableColumns = [
   {
     prop: "name",
     label: "资源库名称",
@@ -179,94 +220,86 @@
     slot: "operations",
     fixed: "right",
     align: "center",
-        }
-    ];
-    const getResourceData = () => {
+  },
+];
+const getResourceData = () => {
   loading.value = true;
   proxy.$post({
     url: "/api/resource/listResource",
     data: {
       ...searchForm.value,
       page: currentPage.value,
-                pagesize: pageSize.value
+      pagesize: pageSize.value,
     },
     callback: (data) => {
       tableData.value = data.rows;
       total.value = data.count;
       loading.value = false;
-            }
-        })
-    };
-    onMounted(() => {
-        getResourceData();
+    },
   });
-    // 分页
-    const handleSizeChange = (size) => {
+};
+onMounted(() => {
+  getResourceData();
+});
+// 分页
+const handleSizeChange = (size) => {
   pageSize.value = size;
   currentPage.value = 1;
   getResourceData();
-    }
-    const handleCurrentPageChange = (page) => {
+};
+const handleCurrentPageChange = (page) => {
   currentPage.value = page;
   getResourceData();
-    }
-    const handleSearch = (formData) => {
+};
+const handleSearch = (formData) => {
   currentPage.value = 1;
   getResourceData();
-    };
+};
 
-    const dialogVisible = ref(false);
-    const dialogTitle = ref("新增资源库");
-    const resourceForm = ref();
-    const resourceFormData = ref({});
-    const resourceRules = {
-        name: [
-            { required: true, message: "请输入名称", trigger: "blur" }
-        ],
-        key: [
-            { required: true, message: "请输入唯一标识", trigger: "blur" }
-        ]
-    };
-    let treeData = ref([]);
-    const treeRef = ref();
-    const handleAdd = () => {
+const dialogVisible = ref(false);
+const dialogTitle = ref("新增资源库");
+const resourceForm = ref();
+const resourceFormData = ref({});
+const resourceRules = {
+  name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+  key: [{ required: true, message: "请输入唯一标识", trigger: "blur" }],
+};
+let treeData = ref([]);
+const treeRef = ref();
+const handleAdd = () => {
   dialogTitle.value = "新增资源库";
   dialogVisible.value = true;
-    };
+};
 
-    const listDialogVisible = ref(false);
-    const listDialogTitle = ref("添加节点");
-    const listForm = ref();
-    const listFormData = ref({});
-    const listRules = {
-        name: [
-            { required: true, message: "请输入名称", trigger: "blur" }
-        ],
-        key: [
-            { required: true, message: "请输入唯一标识", trigger: "blur" }
-        ]
-    };
-    const addNode = () => {
+const listDialogVisible = ref(false);
+const listDialogTitle = ref("添加节点");
+const listForm = ref();
+const listFormData = ref({});
+const listRules = {
+  name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+  key: [{ required: true, message: "请输入唯一标识", trigger: "blur" }],
+};
+const addNode = () => {
   listDialogVisible.value = true;
   listDialogTitle.value = "添加节点";
-    };
-    const nodeData = ref(null);
-    const cancelListForm = () => {
+};
+const nodeData = ref(null);
+const cancelListForm = () => {
   nodeData.value = null;
   listFormData.value = {};
   listForm.value.resetFields();
   listDialogVisible.value = false;
-    };
-    // 添加子节点
-    const nodeAddChild = (data) => {
+};
+// 添加子节点
+const nodeAddChild = (data) => {
   nodeData.value = data;
   addNode();
-    }
-    // 添加节点数据
-    const saveListForm = () => {
+};
+// 添加节点数据
+const saveListForm = () => {
   let data = {
     name: listFormData.value.name,
-            key: listFormData.value.key
+    key: listFormData.value.key,
   };
   if (nodeData.value) {
     treeRef.value.append(data, nodeData.value);
@@ -274,17 +307,18 @@
     treeRef.value.append(data);
   }
   cancelListForm();
-    };
-    const nodeEdit = (data) => {
+};
+const nodeEdit = (data) => {
   listFormData.value = {
-            ...data
+    ...data,
   };
-        dialogVisible.value = false;
+
+  //   dialogVisible.value = false;
   listDialogVisible.value = true;
   listDialogTitle.value = "编辑节点";
-    };
-    // 删除节点
-    const nodeDelete = (data) => {
+};
+// 删除节点
+const nodeDelete = (data) => {
   ElMessageBox.confirm(`确定删除节点${data.name}？`, "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
@@ -292,18 +326,18 @@
   }).then(() => {
     treeRef.value.remove(data);
   });
-    };
-    // 添加资源库
-    const saveResourceForm = () => {
-        resourceForm.value.validate(valid => {
+};
+// 添加资源库
+const saveResourceForm = () => {
+  resourceForm.value.validate((valid) => {
     if (valid) {
-                let url = resourceFormData.value.id ? "updateResource" : "createResource"
+      let url = resourceFormData.value.id ? "updateResource" : "createResource";
       proxy.$post({
         url: "/api/resource/" + url,
         data: {
           ...resourceFormData.value,
           type: resourceFormData.value.type || "1",
-                        resourceInfos: treeData.value
+          resourceInfos: treeData.value,
         },
         callback: (data) => {
           ElMessage.success(dialogTitle.value + "成功");
@@ -312,37 +346,38 @@
         },
         error: (err) => {
           ElMessage.error(dialogTitle.value + "失败:", err);
+        },
+      });
     }
-                })
-            }
-        })
-    }
-    const cancelResourceForm = () => {
+  });
+};
+const cancelResourceForm = () => {
   resourceFormData.value = {};
   treeData.value = [];
   resourceForm.value.resetFields();
   dialogVisible.value = false;
-    };
+};
 
-    const handleEdit = (row, index) => {
+const handleEdit = (row, index) => {
   proxy.$post({
     url: "/api/resource/getResource",
     data: {
-                id: row.id
+      id: row.id,
     },
     callback: (data) => {
       resourceFormData.value = {
         ...data,
-                    type: data.type.toString()
+        type: data.type.toString(),
       };
       treeData.value = data.resourceInfos || [];
+      dialogTitle.value = "编辑资源库";
       dialogVisible.value = true;
-            }
-        })
-    }
+    },
+  });
+};
 
-    // 删除资源库
-    const handleDelete = async (row, index) => {
+// 删除资源库
+const handleDelete = async (row, index) => {
   try {
     await ElMessageBox.confirm(`确定要删除"${row.name}"吗？`, "提示", {
       confirmButtonText: "确定",
@@ -358,16 +393,16 @@
       },
       error: (err) => {
         ElMessage.error("删除失败:", err);
-                }
+      },
     });
   } catch {}
-    };
+};
 </script>
 
 <style lang="less">
-  @import "@/styles/manage.less";
-  .tree-content{
+@import "@/styles/manage.less";
+.tree-content {
   width: 100%;
   height: 150px;
-  }
+}
 </style>

src/views/systemManage/userManage.vue

@@ -230,7 +230,9 @@ const dialogTitle = ref("新增用户");
 
 // 用户表单数据
 const userForm = ref();
-const userFormData = ref({});
+const userFormData = ref({
+  enable: 0,
+});
 const departmentData = ref([]);
 const rolesData = ref([]);