From f21e8d48a6983bc1a17787dc31e5b0a16c5c57d7 Mon Sep 17 00:00:00 2001
From: zhaohy <1695786511@qq.com>
Date: Fri, 23 Aug 2024 14:19:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A0=91=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linkPeople/index.vue                      | 31 +++++++++++++------
 .../alarmManagement/equipmentAlarm/look.vue   |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
index 819926a..8a0c242 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
@@ -70,7 +70,7 @@
   import { http } from '/nerv-lib/util';
 
   //搜索存储 拼凑树的搜索类型
-  const dataList: TreeProps['treeData'] = [];
+  let dataList: TreeProps['treeData'] = [];
   const generateList = (data: TreeProps['treeData']) => {
     for (let i = 0; i < data.length; i++) {
       const node = data[i];
@@ -80,23 +80,28 @@
         generateList(node.children);
       }
     }
+    console.log(dataList, '数据');
   };
   const getParentKey = (
     key: string | number,
     tree: TreeProps['treeData'],
-  ): string | number | undefined => {
-    let parentKey;
-    for (let i = 0; i < tree.length; i++) {
-      const node = tree[i];
+    parents: (string | number)[] = [],
+  ): (string | number)[] | undefined => {
+    for (const node of tree) {
       if (node.children) {
         if (node.children.some((item) => item.key === key)) {
-          parentKey = node.key;
-        } else if (getParentKey(key, node.children)) {
-          parentKey = getParentKey(key, node.children);
+          // 找到目标节点的直接父节点
+          return [...parents, node.key];
+        }
+
+        // 递归检查子节点的子节点
+        const result = getParentKey(key, node.children, [...parents, node.key]);
+        if (result) {
+          return result;
         }
       }
     }
-    return parentKey;
+    return undefined;
   };
   export default defineComponent({
     setup(props, { emit }) {
@@ -172,6 +177,7 @@
         getDepartList({ orgId: orgId.value }).then((res) => {
           deptTreeData.value = res;
           selectedKeys.value = [orgId.value];
+          dataList = [];
           generateList(deptTreeData.value);
         });
       };
@@ -304,7 +310,12 @@
             return null;
           })
           .filter((item, i, self) => item && self.indexOf(item) === i);
-        expandedKeys.value = expanded;
+        console.log(expanded, '数据1111');
+        let selctky = [];
+        expanded.forEach((item) => {
+          selctky.push(...item);
+        });
+        expandedKeys.value = selctky;
         searchValue.value = value;
         autoExpandParent.value = true;
       });
diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
index d2e9539..c746042 100644
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
@@ -128,7 +128,7 @@
         },
         formatter: function (params: any) {
           let res =
-            params[0].marker + '    ' + params[0].seriesName + '  :    ' + params[0].data + 'V';
+            params[0].marker + '  ' + params[0].seriesName + '  :   ' + params[0].data + 'V';
           return res;
         },
       },