diff --git a/frontend/src/components/PGTree.vue b/frontend/src/components/PGTree.vue
index bcd3f659a9632eeab4fce1a2d730d829307820fc..3e4b6131be99400b789869c7c2853b807507666c 100644
--- a/frontend/src/components/PGTree.vue
+++ b/frontend/src/components/PGTree.vue
@@ -4,7 +4,7 @@
             <slot name="header"></slot>
         </div>
         <el-tree :data="department" :props="defaultProps" :show-checkbox="selectable" @node-click="onNodeClicked"
-            :allow-drag="allowDrag" :draggable="dragable">
+            default-expand-all :expand-on-click-node="false" :allow-drag="allowDrag" :draggable="dragable">
             <template #default="{ node, data }">
                 <span class="custom-tree-node">
                     <span>{{ node.label }}</span>
@@ -32,6 +32,8 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { getSubDepartment, updateDepartment } from "@/request/cluster";
 import { RespCodeOK } from "@/request/request";
 
+const emits = defineEmits(["onNodeClicked"])
+
 const props = defineProps({
     defaultProps: {
         type: Object,
@@ -60,12 +62,13 @@ const props = defineProps({
     editable: {
         type: Boolean,
         default: false,
-    },
-    onNodeClicked: {
-        type: Function
     }
 })
 
+function onNodeClicked(node:any, selfSelected:boolean, childrenSelected: boolean) {
+    emits("onNodeClicked", node)
+}
+
 // 部门树
 const department = ref([{}])
 const departmentID = ref(1)
@@ -97,7 +100,7 @@ function renameNode(node: any, data: any) {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
     }).then(({ value }) => {
-        updateDepartment({ 'DepartID': data.id, 'DepartName': value }).then((resp:any) => {
+        updateDepartment({ 'DepartID': data.id, 'DepartName': value }).then((resp: any) => {
             if (resp.code === 200) {
                 ElMessage.success('修改成功');
                 node.parent.loaded = false;
@@ -109,7 +112,7 @@ function renameNode(node: any, data: any) {
         }).catch((err: any) => {
             ElMessage.error('修改失败:' + err.msg)
         })
-    }).catch((err:any) => {
+    }).catch((err: any) => {
         console.log(err)
     });
 }
diff --git a/frontend/src/views/Cluster/CreateBatch.vue b/frontend/src/views/Cluster/CreateBatch.vue
index 01a0d94cb82c5d0c36caeaf2d5461df328facf56..8092c80d62955a3f335bce85bd8166dd302d80b6 100644
--- a/frontend/src/views/Cluster/CreateBatch.vue
+++ b/frontend/src/views/Cluster/CreateBatch.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <div class="department">
-            <PGTree :onNodeClicked="onNodeClicked">
+            <PGTree @onNodeClicked="onNodeClicked">
                 <template v-slot:header>
                     <p>部门</p>
                 </template>
@@ -61,7 +61,6 @@ const selectedDeparts = ref<any[]>([])
 
 function onNodeClicked(node: any) {
     let nodeInfo = toRaw(node)
-    console.log("node clicked", nodeInfo)
 
     getDepartMachines({
         DepartId: nodeInfo.id,
diff --git a/frontend/src/views/User/components/AddUser.vue b/frontend/src/views/User/components/AddUser.vue
index a7bc9baae322f4ac30a7acf050c890c0c117a633..c5176aa640405a186f8484b922d34db84cec8f47 100644
--- a/frontend/src/views/User/components/AddUser.vue
+++ b/frontend/src/views/User/components/AddUser.vue
@@ -10,7 +10,7 @@
             </el-form-item>
             <el-form-item label="部门:" prop="departName">
                 <el-input class="ipInput" controls-position="right" v-model="form.departName" autocomplete="off"></el-input>
-                <PGTree style="width: 98%;" :showHeader="false" :onNodeClicked="onDepartSelected">
+                <PGTree style="width: 98%;" :showHeader="false" @onNodeClicked="onDepartSelected">
                 </PGTree>
             </el-form-item>
             <el-form-item label="用户角色:" prop="role">
diff --git a/frontend/src/views/User/components/UpdateUser.vue b/frontend/src/views/User/components/UpdateUser.vue
index 8125bcd480e999d2cdcc581d1a5c5fd895a4c4c2..9cd45f2de530ccb3401af5d6051f7835e634dea2 100644
--- a/frontend/src/views/User/components/UpdateUser.vue
+++ b/frontend/src/views/User/components/UpdateUser.vue
@@ -8,7 +8,7 @@
             <el-form-item label="部门:" prop="departName">
                 <el-input class="ipInput" controls-position="right" :disabled="disabled" v-model="form.departName"
                     autocomplete="off"></el-input>
-                <PGTree style="width: 98%;" :showHeader="false" :showEdit="false" :onNodeClicked="onDepartSelected">
+                <PGTree style="width: 98%;" :showHeader="false" :showEdit="false" @onNodeClicked="onDepartSelected">
                 </PGTree>
             </el-form-item>
             <el-form-item label="手机号:" prop="phone">