diff --git a/frontend/src/components/PGTree.vue b/frontend/src/components/PGTree.vue index 3e4b6131be99400b789869c7c2853b807507666c..b2b0f7a6bbc8acf3e4539768dcf88134b5c22b6b 100644 --- a/frontend/src/components/PGTree.vue +++ b/frontend/src/components/PGTree.vue @@ -12,11 +12,11 @@ - + - {{ console.log(node) }} + @@ -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 }); } diff --git a/frontend/src/views/Batch/Batch.vue b/frontend/src/views/Batch/Batch.vue index de91461bc8853e218cafa352a32973c01962cddd..6916cf32deddede7d1891a39e412cdcbe1bdcebf 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 8092c80d62955a3f335bce85bd8166dd302d80b6..07a7924d26268a44173af7c69c6fd967df0ef65e 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 56f40fc70e547d912af87c353a61d3cc4f5a3f73..ca001725120613b6422151a433aa6a6c14f4a8ca 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 8f8dd53c5fb78db7461a073fc3802e93e9c1e8ae..4b390a2da003ae617f86af0bddbc1e1090ecf05d 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