From 1a62df566af64dd8f076a24a01697af378abb30e Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Thu, 14 Dec 2023 10:56:25 +0800
Subject: [PATCH] support delete department function

---
 frontend/src/components/PGTree.vue            | 31 ++++++++++++++++---
 frontend/src/views/Batch/Batch.vue            |  1 -
 frontend/src/views/Cluster/CreateBatch.vue    |  1 -
 .../src/views/Role/components/UpdateRole.vue  |  1 -
 frontend/src/views/User/User.vue              |  1 -
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/PGTree.vue b/frontend/src/components/PGTree.vue
index 3e4b613..b2b0f7a 100644
--- a/frontend/src/components/PGTree.vue
+++ b/frontend/src/components/PGTree.vue
@@ -12,11 +12,11 @@
                         <el-icon>
                             <Plus />
                         </el-icon>
-                        <el-icon v-if="data.id !== 1">
+                        <el-icon v-if="data.id !== 1" @click.stop="deleteNode(node, data)">
                             <Delete />
                         </el-icon>
                         <el-icon @click.stop="renameNode(node, data)">
-                            <EditPen />{{ console.log(node) }}
+                            <EditPen />
                         </el-icon>
                     </span>
                 </span>
@@ -29,7 +29,7 @@
 import { onMounted, ref } from "vue";
 import { ElMessage, ElMessageBox } from 'element-plus';
 
-import { getSubDepartment, updateDepartment } from "@/request/cluster";
+import { getSubDepartment, updateDepartment, deleteDepartment } from "@/request/cluster";
 import { RespCodeOK } from "@/request/request";
 
 const emits = defineEmits(["onNodeClicked"])
@@ -113,7 +113,30 @@ function renameNode(node: any, data: any) {
             ElMessage.error('修改失败:' + err.msg)
         })
     }).catch((err: any) => {
-        console.log(err)
+        // cancel rename
+    });
+}
+
+function deleteNode(node: any, data: any) {
+    ElMessageBox.confirm('确定删除该节点？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+     }).then(() => {
+        deleteDepartment({ 'DepartID': data.id }).then((resp: any) => {
+            if (resp.code === 200) {
+                ElMessage.success('修改成功');
+                node.parent.loaded = false;
+                node.parent.expand();
+                updateDepartmentInfo();
+            } else {
+                ElMessage.error(resp.msg)
+            }
+        }).catch((err: any) => {
+            ElMessage.error('修改失败:' + err.msg)
+        })
+    }).catch((err: any) => {
+        // cancel delete
     });
 }
 </script>
diff --git a/frontend/src/views/Batch/Batch.vue b/frontend/src/views/Batch/Batch.vue
index de91461..6916cf3 100644
--- a/frontend/src/views/Batch/Batch.vue
+++ b/frontend/src/views/Batch/Batch.vue
@@ -111,7 +111,6 @@ function batchDelete() {
             let params: number[] = [];
             (toRaw(selectedBatches.value) as any[]).forEach((item) => {
                 params.push(item.ID)
-                console.log(item)
             });
 
             deleteBatch({ BatchID: params }).then((resp: any) => {
diff --git a/frontend/src/views/Cluster/CreateBatch.vue b/frontend/src/views/Cluster/CreateBatch.vue
index 8092c80..07a7924 100644
--- a/frontend/src/views/Cluster/CreateBatch.vue
+++ b/frontend/src/views/Cluster/CreateBatch.vue
@@ -67,7 +67,6 @@ function onNodeClicked(node: any) {
     }).then((resp: any) => {
         if (resp.code === RespCodeOK) {
             nodeMachines.value = []
-            console.log("machines:", resp.data)
             resp.data.forEach((item: any) => {
                 nodeMachines.value.push({
                     key: item.id,
diff --git a/frontend/src/views/Role/components/UpdateRole.vue b/frontend/src/views/Role/components/UpdateRole.vue
index 56f40fc..ca00172 100644
--- a/frontend/src/views/Role/components/UpdateRole.vue
+++ b/frontend/src/views/Role/components/UpdateRole.vue
@@ -53,7 +53,6 @@ function onUpdateRole() {
     formRef.value.validate((valid: boolean) => {
         if (valid) {
             updateRole(params).then((resp: any) => {
-                console.log(resp)
                 if (resp.code === RespCodeOK) {
                     ElMessage.success("success to update role info:"+ resp.msg);
                 } else {
diff --git a/frontend/src/views/User/User.vue b/frontend/src/views/User/User.vue
index 8f8dd53..4b390a2 100644
--- a/frontend/src/views/User/User.vue
+++ b/frontend/src/views/User/User.vue
@@ -100,7 +100,6 @@ function onDeleteUser() {
     selectedUsers.value.forEach((item:any)=>{
         params.push(item.email);
     })
-    console.log("delete user:", params)
 
     deleteUser({
         delDatas: params
-- 
Gitee