From 798bba892e21223a9e65a4eb7c886869e24ea373 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 21 Feb 2024 09:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/drawpic.vue | 51 +++++++++++++++++----------
 src/views/home/components/picTree.vue | 34 ++++++++++++++----
 2 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/src/views/home/components/drawpic.vue b/src/views/home/components/drawpic.vue
index c5b2385..a99ab40 100644
--- a/src/views/home/components/drawpic.vue
+++ b/src/views/home/components/drawpic.vue
@@ -753,27 +753,40 @@ export default {
     },
     //删除图片和数据
     deletePic() {
-      this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      deleteApi({
+        path: this.parentdata.name + "/" + this.currentNodeData.name,
       })
-        .then(() => {
-          deleteApi({
-            path: this.parentdata.name + "/" + this.currentNodeData.name,
-          })
-            .then((res) => {
-              console.log(res);
-              this.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-              EventBus.$emit("treelist");
-              localStorage.removeItem("currentData");
-            })
-            .catch((err) => {});
+        .then((res) => {
+          console.log(res);
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          //EventBus.$emit("treelist");
+          localStorage.removeItem("currentData");
         })
-        .catch(() => {});
+        .catch((err) => {});
+      // this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      // })
+      //   .then(() => {
+      //     deleteApi({
+      //       path: this.parentdata.name + "/" + this.currentNodeData.name,
+      //     })
+      //       .then((res) => {
+      //         console.log(res);
+      //         this.$message({
+      //           type: "success",
+      //           message: "删除成功!",
+      //         });
+      //         //EventBus.$emit("treelist");
+      //         localStorage.removeItem("currentData");
+      //       })
+      //       .catch((err) => {});
+      //   })
+      //   .catch(() => {});
     },
   },
 };
diff --git a/src/views/home/components/picTree.vue b/src/views/home/components/picTree.vue
index 2a0852e..f0f78cd 100644
--- a/src/views/home/components/picTree.vue
+++ b/src/views/home/components/picTree.vue
@@ -14,11 +14,11 @@
     >
       <span class="custom-tree-node" slot-scope="{ node, data }">
         <span v-if="node.level === 1">
-          <span>{{ node.label }}</span>
+          <span>{{ node.label }}</span> ({{ data.children.length }})
         </span>
         <span v-else-if="node.level === 2">
           <i v-if="data.marked" class="el-icon-s-flag"></i>
-          <span>{{ node.label }}</span>
+          <span :title="node.label">{{ node.label }}</span>
         </span>
       </span>
     </el-tree>
@@ -98,7 +98,7 @@ export default {
         })
         .catch((err) => {});
     },
-    handleNodeClick(node) {
+    handleNodeClick(node, data) {
       //点击父节点收起
       if (node.children?.length) {
         this.$nextTick(() => {
@@ -108,8 +108,18 @@ export default {
       }
       this.currentNodeKey = node.name;
       console.log(node); // 你会看到当前节点的数据
-      const parentNode = this.$refs.tree.getNode(node).parent.data;
-      console.log(parentNode); // 输出父节点的数据对象
+      console.log(data);
+      const parentNode = this.findParentNode(data.id, this.piclist);
+
+      if (parentNode) {
+        // 找到了父节点，打印父节点的数据
+        console.log(parentNode); // 输出父节点的数据对象
+      } else {
+        // 没找到父节点，处理错误情况
+        console.error("未能找到父节点");
+      }
+      //const parentNode = this.$refs.tree.getNode(node).parent;
+      // //const parentNode = this.$refs.tree.getNode(node).parent.data;
       EventBus.$emit("currentNodeData", node);
       EventBus.$emit("perentNode", parentNode);
       this.defaultExpandedKeys = [parentNode.name];
@@ -118,6 +128,18 @@ export default {
       this.getlabels();
       localStorage.setItem("currentData", JSON.stringify(node));
     },
+    findParentNode(childId, treeData) {
+      console.log(childId);
+      console.log(treeData);
+      // 递归查找父节点
+      return treeData.find((parent) => {
+        console.log(parent);
+        return (
+          parent.children &&
+          parent.children.find((child) => child.$treeNodeId === childId)
+        );
+      });
+    },
     getlabels() {
       getLabelsApi({
         path: this.pathParams,
@@ -150,7 +172,7 @@ export default {
 </script>
 <style lang="less">
 .picTree {
-  width: 300px;
+  width: 380px;
   padding: 10px;
   border: 1px solid #dcdfe6;
   border-radius: 4px;