@ganwei-web/gw-base-components-plus 1.0.20 → 1.0.22

package/equip-list-vue3/dist/index.es.js

@@ -1,45 +1,45 @@
-import { createBlock as S, createCommentVNode as f, createElementBlock as l, createElementVNode as C, createTextVNode as k, createVNode as q, mergeProps as x, normalizeClass as G, normalizeStyle as O, openBlock as n, resolveComponent as g, toDisplayString as b, toHandlers as T, withCtx as w, withModifiers as M } from "vue";
+import { createBlock as E, createCommentVNode as w, createElementBlock as d, createElementVNode as S, createTextVNode as M, createVNode as b, mergeProps as L, normalizeClass as y, normalizeStyle as G, openBlock as p, resolveComponent as C, toDisplayString as N, toHandlers as _, withCtx as q, withModifiers as k } from "vue";
 import I from "vue3-virtual-scroll-list";
-import * as y from "@aspnet/signalr";
+import * as T from "@aspnet/signalr";
 
 import "./style.css";
-class _ {
+class v {
   // 分组节点扁平化对象、设备扁平化对象、window缓存设备扁平化对象
-  constructor(e, t, i) {
-    this.groupNodeObject = e, this.nodesMap = t, this.controlObject = i;
+  constructor(t, e, i) {
+    this.groupNodeObject = t, this.nodesMap = e, this.controlObject = i;
   }
   // 增加映射
-  addNodesMap(e) {
-    e && e.forEach((t) => {
-      this.nodesMap[t.key] = t;
+  addNodesMap(t) {
+    t && t.forEach((e) => {
+      this.nodesMap[e.key] = e;
     });
   }
   // 移除映射
-  removeNodesMap(e) {
-    e && e.forEach((t) => {
-      delete this.nodesMap[t.key];
+  removeNodesMap(t) {
+    t && t.forEach((e) => {
+      delete this.nodesMap[e.key];
     });
   }
   // 回收所有分组节点缓存
-  recycleAllNodeCache(e) {
-    for (let t in this.groupNodeObject) { this.groupNodeObject[t].expand = !1, this.groupNodeObject[t].count = 0, this.recycleGroupCache(this.groupNodeObject[t].key), e && delete this.groupNodeObject[t]; }
+  recycleAllNodeCache(t) {
+    for (let e in this.groupNodeObject) { this.groupNodeObject[e].expand = !1, this.groupNodeObject[e].count = 0, this.recycleGroupCache(this.groupNodeObject[e].key), t && delete this.groupNodeObject[e]; }
   }
   // 回收分组节点内存
-  recycleGroupCache(e) {
-    if (this.groupNodeObject[e]) {
-      this.groupNodeObject[e].children = [], this.removeNodesMap(this.groupNodeObject[e].equips), this.groupNodeObject[e].equips = [], this.groupNodeObject[e].equips.length = 0, this.groupNodeObject[e].expand = !1;
-      for (let t in this.groupNodeObject) { this.groupNodeObject[t].groupId == e && this.recycleGroupCache(this.groupNodeObject[t].key); }
+  recycleGroupCache(t) {
+    if (this.groupNodeObject[t]) {
+      this.groupNodeObject[t].children = [], this.removeNodesMap(this.groupNodeObject[t].equips), this.groupNodeObject[t].equips = [], this.groupNodeObject[t].equips.length = 0, this.groupNodeObject[t].expand = !1;
+      for (let e in this.groupNodeObject) { this.groupNodeObject[e].groupId == t && this.recycleGroupCache(this.groupNodeObject[e].key); }
     }
   }
   // 关闭兄弟分组节点及回收内存
-  closeBrotherNode(e) {
-    if (e && this.groupNodeObject[e]) {
-      let t = this.groupNodeObject[e].groupId;
-      for (let i in this.groupNodeObject) { this.groupNodeObject[i].groupId == t && this.groupNodeObject[i].key != e && this.groupNodeObject[i].expand && (this.groupNodeObject[i].expand = !1, this.recycleGroupCache(this.groupNodeObject[i].key)); }
+  closeBrotherNode(t) {
+    if (t && this.groupNodeObject[t]) {
+      let e = this.groupNodeObject[t].groupId;
+      for (let i in this.groupNodeObject) { this.groupNodeObject[i].groupId == e && this.groupNodeObject[i].key != t && this.groupNodeObject[i].expand && (this.groupNodeObject[i].expand = !1, this.recycleGroupCache(this.groupNodeObject[i].key)); }
     }
   }
 }
-class N {
+class m {
   constructor() {
     this.window = window;
     try {
@@ -49,7 +49,7 @@ class N {
     }
   }
 }
-const m = {
+const x = {
   data() {
     return {
       window: null
@@ -64,117 +64,141 @@ const m = {
     }
   }
 };
-class L extends N {
-  constructor(e, t, i, o, u, a) {
-    super(), this.equipControllObject = i, this.groupNodeObject = e, this.nodesMap = t, this.controlObject = o, this.equipCheckObject = u, this.isSearchStatus = !1, this.searchStatusGroupObject = {}, this.aliasName = a;
+class A extends m {
+  constructor(t, e, i, o, u, a) {
+    super(), this.equipControllObject = i, this.groupNodeObject = t, this.nodesMap = e, this.controlObject = o, this.equipCheckObject = u, this.isSearchStatus = !1, this.searchStatusGroupObject = {}, this.aliasName = a;
   }
   resetCheckedStatus() {
-    Object.values(this.nodesMap).forEach((e) => {
-      this.setCheckStatus(e.key, !1, !1), e.isGroup && !e.isEquip && (this.clearCheckedEquips(e.key), this.updateEquipSelectCount(e.key, !0)), e.halfCheckedEquips && (e.halfCheckedEquips = []);
-    }), Object.keys(this.equipCheckObject).forEach((e) => {
-      this.setEquipCheckObject(e, !1, !1, this.equipCheckObject[e].groupId);
-    });
+    Object.values(this.nodesMap).forEach((t) => {
+      this.setCheckStatus(t.key, !1, !1);
+    }), Object.keys(this.equipCheckObject).forEach((t) => delete this.equipCheckObject[t]), this.updateGroupCheckStatus();
   }
-  // 搜索状态下,更新分组选中状态
+
   /**
-   *  1:备份原有选中的设备数据量,父级分组Id
-   *  2:清空之前分组的设备选中数量
-   *  3:依照搜索结果,重新计算分组选中的设备数据量
-   *  */
-  reComputedCheckNum(e) {
-    this.isSearchStatus = e, this.isSearchStatus ? (Object.values(this.groupNodeObject).forEach((t) => {
-      this.searchStatusGroupObject[t.key] = {
-        groupId: t.groupId,
-        equipSelectCount: t.equipSelectCount,
-        halfCheckedEquips: t.halfCheckedEquips,
-        ...this.searchStatusGroupObject[t.key]
-      };
-    }), Object.values(this.groupNodeObject).forEach((t) => {
-      this.updateEquipSelectCount(t.key, !0), t.halfCheckedEquips = [];
-    }), Object.values(this.groupNodeObject).forEach((t) => {
-      (this.window[`group-${t.key}-search`] || []).forEach((o) => {
-        this.equipCheckObject[o.equipNo] && this.equipCheckObject[o.equipNo].checked ? this.updateEquipSelectCount(t.key, !1, 1) : this.equipCheckObject[o.equipNo] && this.equipCheckObject[o.equipNo].indeterminate && t.halfCheckedEquips.push(o.equipNo);
-      });
-    })) : (Object.values(this.groupNodeObject).forEach((t) => {
-      let i = this.searchStatusGroupObject[t.key];
-      i && (t.equipSelectCount = i.equipSelectCount, t.halfCheckedEquips = [...i.halfCheckedEquips, ...t.halfCheckedEquips], t.halfCheckedEquips = [...new Set(t.halfCheckedEquips)]);
-    }), this.searchStatusGroupObject = {});
+   * 搜索状态下,更新分组选中状态
+   * 新方案：直接调用 updateGroupCheckStatus 重新计算
+   */
+  reComputedCheckNum(t) {
+    this.isSearchStatus = t, this.updateGroupCheckStatus();
   }
   // 根据传过来的设备选中数据、回显选中状态
   /**
-   *  1:记录进全局设备选中状态
-   *  2:设备设备选中状态
-   *  3:更新分组选中的设备数量
-   *  4:更新展开的设备控制项选中状态
-   *  5:更新分组选中状态
-   *  */
-  updateCheckedStatusWithEquips(e) {
-    window.setTimeout(() => {
-      for (let t = 0, i = e.length; t < i; t++) {
-        let o = this.window.equipCache && this.window.equipCache[e[t]];
-        o && o.groupId && (this.setEquipCheckObject(e[t], !0, !1, o.groupId), this.setCheckStatus(`${o.groupId}-${e[t]}`, !0, !1), this.updateEquipSelectCount(o.groupId, !1, 1), this.updateExpandControlCheckStatus(o.groupId, e[t]));
+   * 支持两种数据格式：
+   *   格式1：纯 equipNo 数组，如 [1, 2, 3]，选中该设备在所有分组下的实例
+   *   格式2：{ groupId: [equipNo1, equipNo2] } 对象，如 { 2: [1, 2], 3: [5] }，只选中指定分组下的设备
+   *
+   * 注意：此方法只负责将选中状态写入 equipCheckObject，不调用 updateGroupCheckStatus。
+   * 分组状态的更新由调用方在合适的时机（数据就绪后）统一调用。
+   */
+  updateCheckedStatusWithEquips(t) {
+    let e = [];
+    Array.isArray(t) ? e = t.map((i) => ({ equipNo: i, groupId: null })) : t !== null && typeof t == "object" && Object.keys(t).forEach((i) => {
+      Array.isArray(t[i]) && t[i].forEach((o) => {
+        e.push({ equipNo: o, groupId: Number(i) });
+      });
+    });
+    for (let i = 0, o = e.length; i < o; i++) {
+      const { equipNo: u, groupId: a } = e[i];
+      if (a != null) {
+        const h = `${a}-${u}`;
+        this.setEquipCheckObject(h, !0, !1, a), this.setCheckStatus(h, !0, !1), this.updateExpandControlCheckStatus(a, u);
+      } else {
+        const h = this.window.equipCache && this.window.equipCache[u];
+        h && (h.groupIds || (h.groupId ? [h.groupId] : [])).forEach((n) => {
+          const c = `${n}-${u}`;
+          this.setEquipCheckObject(c, !0, !1, n), this.setCheckStatus(c, !0, !1), this.updateExpandControlCheckStatus(n, u);
+        });
       }
-      this.updateGroupCheckStatus();
-    }, 200);
+    }
   }
   // 更新展开的设备控制项选中状态
-  updateExpandControlCheckStatus(e, t) {
-    let i = this.nodesMap[`${e}-${t}`];
+  updateExpandControlCheckStatus(t, e) {
+    let i = this.nodesMap[`${t}-${e}`];
     i && i.settings && i.settings.length && i.settings.forEach((o) => {
-      this.nodesMap[`${e}-${t}-${o.setNo}`] && this.setCheckStatus(`${e}-${t}-${o.setNo}`, !0, !1);
+      this.nodesMap[`${t}-${e}-${o.setNo}`] && this.setCheckStatus(`${t}-${e}-${o.setNo}`, !0, !1);
     });
   }
   // 根据传过来的设备控制项，回显设备分组选中状态
   /**
-   *  1:记录全局设备控制项选中
-   *  2:设置设备和设备控制项选中状态
-   *  3:记录分组的半选设备
-   *  4:记录全局设备半选状态
-   *  5:更新分组选中状态
-   *  */
-  updateCheckedStatusWithControls(e) {
-    window.setTimeout(() => {
-      for (let t = 0, i = e.length; t < i; t++) {
-        let o = e[t].split("."), u = o[0], a = o[1];
-        if (this.equipControllObject[u] || (this.equipControllObject[u] = []), this.equipControllObject[u].push(Number(a)), this.window.equipCache && this.window.equipCache[u]) {
-          let r = this.window.equipCache[u].groupId, h = `${r}-${u}-${a}`;
-          this.nodesMap[h] && this.setCheckStatus(h, !0, !1), this.nodesMap[`${r}-${u}`] && this.setCheckStatus(`${r}-${u}`, !1, !0), this.nodesMap[`${r}`].halfCheckedEquips && this.nodesMap[`${r}`].halfCheckedEquips.push(u), this.setEquipCheckObject(u, !1, !0, r);
-        }
+   * 注意：此方法只负责将控制项状态写入 equipControllObject/equipCheckObject，不调用 updateGroupCheckStatus。
+   * 分组状态的更新由调用方在合适的时机（数据就绪后）统一调用。
+   */
+  updateCheckedStatusWithControls(t) {
+    for (let e = 0, i = t.length; e < i; e++) {
+      let o = t[e], u, a, h;
+      if (o !== null && typeof o == "object" && !Array.isArray(o)) { u = o.equipNo, a = o.setNo, h = o.groupId; } else {
+        let n = o.split(".");
+        u = n[0], a = n[1], h = null;
       }
-      this.updateGroupCheckStatus();
-    }, 100);
+      this.equipControllObject[u] || (this.equipControllObject[u] = []), this.equipControllObject[u].push(Number(a));
+      const r = this.window.equipCache && this.window.equipCache[u];
+      r && (h != null ? [h] : r.groupIds || (r.groupId ? [r.groupId] : [])).forEach((c) => {
+        const g = `${c}-${u}`, l = `${c}-${u}-${a}`;
+        this.nodesMap[l] && this.setCheckStatus(l, !0, !1), this.nodesMap[g] && this.setCheckStatus(g, !1, !0), this.setEquipCheckObject(g, !1, !0, c);
+      });
+    }
   }
-  // 更新分组选中状态
+  // 更新分组选中状态------------------------------------------------------------------------------------
+  /**
+   * 新方案：基于 equipCheckObject 实时计算分组状态，而不是依赖中间状态
+   * 优点：状态判断准确，不会累积误差
+   */
   updateGroupCheckStatus() {
-    Object.values(this.groupNodeObject).forEach((e) => {
-      e.count > 0 && e.count == e.equipSelectCount ? this.setCheckStatus(e.key, !0, !1) : e.count && e.equipSelectCount && e.count > e.equipSelectCount || e.halfCheckedEquips.length ? this.setGroupHalfChecked(e.key) : this.setCheckStatus(e.key, !1, !1);
+    this.getSortedGroupsByLevel().forEach((e) => {
+      const i = this.computeGroupStatus(e.key);
+      this.setCheckStatus(e.key, i.checked, i.indeterminate), e.equipSelectCount = i.selectCount;
     });
   }
-  // 设置父级分组半选状态
-  setGroupHalfChecked(e) {
-    this.nodesMap[e] && this.setCheckStatus(e, !1, !0), this.nodesMap[e].groupId && this.setGroupHalfChecked(this.nodesMap[e].groupId);
+  // 按层级排序分组（从深到浅，确保子分组先处理）
+  getSortedGroupsByLevel() {
+    return Object.values(this.groupNodeObject).sort((t, e) => e.level - t.level);
+  }
+  // 计算单个分组的选中状态
+  /**
+   * @returns {Object} { checked, indeterminate, selectCount }
+   */
+  computeGroupStatus(t) {
+    const e = this.groupNodeObject[t];
+    if (!e) { return { checked: !1, indeterminate: !1, selectCount: 0 }; }
+    const i = this.isSearchStatus ? this.window[`group-${t}-search`] || [] : this.window[`group-${t}${this.aliasName}`] || [];
+    let o = 0;
+    i.forEach((g) => {
+      const l = `${t}-${g.equipNo}`;
+      this.equipCheckObject[l] && this.equipCheckObject[l].checked && o++;
+    });
+    let u = 0, a = 0, h = !1, r = !1;
+    e.groups && e.groups.length > 0 && e.groups.forEach((g) => {
+      const l = this.nodesMap[g.key];
+      l && (l.checked ? (u += l.count || 0, h = !0) : l.indeterminate ? (r = !0, h = !0) : r = !0, a += l.count || 0);
+    });
+    const n = o + u, c = e.count || 0;
+    return c === 0 ? { checked: !1, indeterminate: !1, selectCount: 0 } : n === 0 ? h ? { checked: !1, indeterminate: !0, selectCount: n } : { checked: !1, indeterminate: !1, selectCount: 0 } : n === c && !r ? { checked: !0, indeterminate: !1, selectCount: n } : { checked: !1, indeterminate: !0, selectCount: n };
   }
   // 设置设备控制项状态
-  setControlStatus(e, t, i, o) {
-    e && e.forEach((u) => {
-      this.nodesMap[`${t}-${i}-${u.setNo}`] && this.setCheckStatus(`${t}-${i}-${u.setNo}`, o, !1);
+  setControlStatus(t, e, i, o) {
+    t && t.forEach((u) => {
+      this.nodesMap[`${e}-${i}-${u.setNo}`] && this.setCheckStatus(`${e}-${i}-${u.setNo}`, o, !1);
     });
   }
   // 更新设备控制项选中状态
+  /**
+   *  改造点：controlObject 键格式统一为 ${groupId}-${equipNo}
+   *  */
   updateControlCheckStatus() {
-    Object.keys(this.controlObject).forEach((e) => {
-      let t = this.nodesMap[`${this.controlObject[e].groupId}-${e}`];
-      if (t) {
- if (t.checked) {
-          let i = t.settings;
-          this.setControlStatus(i, this.controlObject[e].groupId, e, !0);
-        } else if (!t.checked && !t.indeterminate) {
-          let i = t.settings;
-          this.setControlStatus(i, this.controlObject[e].groupId, e, !1);
+    Object.keys(this.controlObject).forEach((t) => {
+      const [e, i] = t.split("-");
+      let o = this.nodesMap[t];
+      if (o) {
+ if (o.checked) {
+          let u = o.settings;
+          this.setControlStatus(u, e, i, !0);
+        } else if (!o.checked && !o.indeterminate) {
+          let u = o.settings;
+          this.setControlStatus(u, e, i, !1);
         } else {
- this.equipControllObject[e] && this.equipControllObject[e].forEach((i) => {
-            let o = `${this.controlObject[e].groupId}-${e}-${i}`;
-            this.nodesMap[o] && this.setCheckStatus(o, !0, !1);
+ this.equipControllObject[i] && this.equipControllObject[i].forEach((u) => {
+            let a = `${e}-${i}-${u}`;
+            this.nodesMap[a] && this.setCheckStatus(a, !0, !1);
           }); 
 } 
 }
@@ -182,358 +206,340 @@ class L extends N {
   }
   // 获取选中的分组
   getGroupChecked() {
-    let e = [];
-    return Object.keys(this.groupNodeObject).forEach((t) => {
-      this.groupNodeObject[t].checked && e.push(t);
-    }), e;
+    let t = [];
+    return Object.keys(this.groupNodeObject).forEach((e) => {
+      this.groupNodeObject[e].checked && t.push(e);
+    }), t;
   }
   // 获取选中设备
   getEquipSelectd() {
-    let e = [];
-    return Object.keys(this.equipCheckObject).forEach((t) => {
-      this.equipCheckObject[t].checked && e.push(Number(t));
+    let t = [], e = /* @__PURE__ */ new Set();
+    return Object.keys(this.equipCheckObject).forEach((i) => {
+      if (this.equipCheckObject[i].checked) {
+ try {
+          e.add(Number(i.split("-")[1]));
+        } catch (o) {
+          console.log(o);
+        } 
+}
+    }), t = Array.from(e), t;
+  }
+  // 获取选中设备（携带分组）
+  getEquipGroupSelectd() {
+    let t = Object.keys(this.equipCheckObject);
+    return t.length > 0 && (t = this.returnArray(t)), t;
+  }
+  returnArray(t) {
+    const e = [];
+    return t.forEach((i) => {
+      const [o, u] = i.split("-"), a = parseInt(u);
+      isNaN(a) || e.push(a);
     }), e;
   }
-  // 获取选中的设备控制箱
-  getControlSelected() {
-    let e = [];
-    return Object.keys(this.equipControllObject).forEach((t) => {
-      e.push(...this.equipControllObject[t].map((i) => `${t}.${i}`));
+  // 解析设备数组为分组格式
+  parseEquipArrayToGroupFormat(t) {
+    const e = {};
+    return t.forEach((i) => {
+      const [o, u] = i.split("-"), a = parseInt(o);
+      isNaN(a) || (e[a] || (e[a] = []), e[a].push(parseInt(u)));
     }), e;
   }
+  // 获取选中的设备控制项
+  getControlSelected() {
+    let t = [];
+    return Object.keys(this.equipControllObject).forEach((e) => {
+      t.push(...this.equipControllObject[e].map((i) => `${e}.${i}`));
+    }), t;
+  }
   // 点击选中
   /**
    *  1:如果是分组选择，触发分组选中事件
    *  2:如果是设备选择，触发设备选中事件
    *  3:如果是设备控制项选择，触发设备控制项选中事件
    *  */
-  onChecked(e, t) {
-    this.isSearchStatus = t || !1, e.isGroup && !e.isEquip ? this.selectGroup(e) : e.isEquip ? this.selectEquip(e) : e.isSetting && this.selectControl(e);
+  onChecked(t, e) {
+    this.isSearchStatus = e || !1, t.isGroup && !t.isEquip ? this.selectGroup(t) : t.isEquip ? this.selectEquip(t) : t.isSetting && this.selectControl(t);
   }
   // 从全局映射中，设置节点选中状态
-  setCheckStatus(e, t, i) {
-    this.nodesMap[e] && (this.nodesMap[e].checked = t, this.nodesMap[e].isGroup && (this.nodesMap[e].indeterminate = i));
-  }
-  // 清除选中的设备
-  clearCheckedEquips(e) {
-    this.groupNodeObject[e] && (this.groupNodeObject[e].equipSelectCount = 0, this.groupNodeObject[e].halfCheckedEquips && this.groupNodeObject[e].halfCheckedEquips.forEach((t) => {
-      this.equipControllObject[t] && this.equipControllObject[t].forEach((i) => {
-        this.setCheckStatus(`${e}-${t}-${i}`, !1, !1);
-      });
-    }), this.groupNodeObject[e].halfCheckedEquips = [], this.groupNodeObject[e].groupId && this.clearCheckedEquips(this.groupNodeObject[e].groupId));
-  }
-  // 搜索状态下，更新分组选中的设备数量
-  updateSearchStatusObject(e, t) {
-    this.searchStatusGroupObject[e] && (this.searchStatusGroupObject[e].equipSelectCount = this.searchStatusGroupObject[e].equipSelectCount + t, this.searchStatusGroupObject[e].groupId && this.updateSearchStatusObject(this.searchStatusGroupObject[e].groupId, t));
-  }
-  // 更新分组设备选中数量
-  updateEquipSelectCount(e, t, i) {
-    this.nodesMap[e] && (t ? this.nodesMap[e].equipSelectCount = 0 : this.nodesMap[e].equipSelectCount = this.nodesMap[e].equipSelectCount + i, this.nodesMap[e].groupId && this.updateEquipSelectCount(this.nodesMap[e].groupId, t, i));
+  setCheckStatus(t, e, i, o) {
+    this.nodesMap[t] && (this.nodesMap[t].checked = e, this.nodesMap[t].isGroup && (this.nodesMap[t].indeterminate = i));
   }
   // 保存全局设备选中状态
-  setEquipCheckObject(e, t, i, o) {
-    this.equipCheckObject[e] || (this.equipCheckObject[e] = {}), this.equipCheckObject[e].checked = t, this.equipCheckObject[e].indeterminate = i, this.equipCheckObject[e].groupId = o;
-  }
-  // 更新当前展开的分组所选中的设备、设置分组选中的设备数量、更新选中状态（已经实例化的节点）
-  updateEquipSelect(e, t, i, o) {
-    this.nodesMap[e] && t.length && t.forEach((u) => {
-      i ? (this.setEquipCheckObject(u.equipNo, !0, !1, e), this.nodesMap[`${e}-${u.equipNo}`] && this.setCheckStatus(`${e}-${u.equipNo}`, !0, !1)) : (this.setEquipCheckObject(u.equipNo, !1, !1, e), this.nodesMap[`${e}-${u.equipNo}`] && this.setCheckStatus(`${e}-${u.equipNo}`, !1, !1)), this.equipControllObject[u.equipNo] && delete this.equipControllObject[u.equipNo], this.nodesMap[e].halfCheckedEquips.includes(u.equipNo) && (this.nodesMap[e].halfCheckedEquips = this.nodesMap[e].halfCheckedEquips.filter((a) => a != u.equipNo), this.searchStatusGroupObject[e] && (this.searchStatusGroupObject[e].halfCheckedEquips = this.nodesMap[e].halfCheckedEquips));
-    });
-  }
-  // 根据分组更新选中的设备，全选分组或者取消选择分组时调用
-  /**
-   *  1:统计需要更新的设备数量
-   *  2:把所有子孙分组设备全部统计，并且记录所有当前分组选中的设备，更新除分组之外的选中状态（已经实例化的节点）
-   *  3:更新自身设备选择数量、向上级分组累加已经选中的设备数量
-   *  4:更新搜索状态下分组副本数据
-   *  */
-  // list(Array):所要更新的分组，type(String):更新类型，add为新增，delete为删除;
-  updateGroupSelect(e, t) {
-    e.forEach((i) => {
-      if (this.groupNodeObject[i]) {
-        this.groupNodeObject[i].groups && this.groupNodeObject[i].groups.length > 0 && this.updateGroupSelect(this.groupNodeObject[i].groups.map((h) => h.key), t);
-        let o = this.window[`group-${i}${this.aliasName}`] || [];
-        this.isSearchStatus && (o = this.window[`group-${i}-search`] || []);
-        let u = 0, a = 0;
-        o.forEach((h) => {
-          let c = this.equipCheckObject[h.equipNo];
-          !c || !c.checked ? u++ : a--;
-        });
-        let r = t ? u : a;
-        this.updateEquipSelect(i, o, t, r), this.updateEquipSelectCount(i, !1, r), this.updateSearchStatusObject(i, r);
-      }
-    });
-  }
-  // 清除分组挂载的半选设备
-  clearHalfCheckedEquips(e) {
-    e.forEach((t) => {
-      this.groupNodeObject[t].halfCheckedEquips && this.groupNodeObject[t].halfCheckedEquips.forEach((i) => {
-        this.equipControllObject[i] && this.equipControllObject[i].forEach((o) => {
-          this.setCheckStatus(`${t}-${i}-${o}`, !1, !1);
-        });
-      }), this.groupNodeObject[t].halfCheckedEquips = [], this.groupNodeObject[t].groups && this.groupNodeObject[t].groups.length > 0 && this.clearHalfCheckedEquips(this.groupNodeObject[t].groups.map((i) => i.key));
-    });
+  setEquipCheckObject(t, e, i, o) {
+    this.equipCheckObject[t] || (this.equipCheckObject[t] = {}), this.equipCheckObject[t].checked = e, this.equipCheckObject[t].indeterminate = i, this.equipCheckObject[t].groupId = o, !e && !i && delete this.equipCheckObject[t];
   }
   // 触发分组选择
-  /**
-   * 1:清除之前半选设备
-  *  2:更新分组中设备选择
-  *  3:更新所有分组选中状态
-  *  4:更新控制项选中状态
-  *  */
-  selectGroup(e) {
-    this.clearHalfCheckedEquips([e.key]), this.updateGroupSelect([e.key], e.checked), this.updateControlCheckStatus(), this.updateGroupCheckStatus();
+  selectGroup(t) {
+    this.updateAllEquipStatus(t.key, t.checked), this.updateControlCheckStatus(), this.updateGroupCheckStatus();
+  }
+  // 更新分组下所有设备的选中状态
+  updateAllEquipStatus(t, e) {
+    const i = this.groupNodeObject[t];
+    if (!i) { return; }
+    (this.isSearchStatus ? this.window[`group-${t}-search`] || [] : this.window[`group-${t}${this.aliasName}`] || []).forEach((u) => {
+      const a = `${t}-${u.equipNo}`;
+      this.setEquipCheckObject(a, e, !1, t), this.nodesMap[a] && this.setCheckStatus(a, e, !1);
+    }), i.groups && i.groups.length > 0 && i.groups.forEach((u) => {
+      this.updateAllEquipStatus(u.key, e);
+    });
   }
   // 触发设备选择
   /**
-  *  1:更新分组选择的设备
-  *  2:更新分组所选择的设备数量
-  *  3:更新控制项选中状态
-  *  4:更新分组状态
-  *  */
-  selectEquip(e) {
-    if (this.nodesMap[e.groupId]) {
-      let t = [{ equipNo: e.equipNo }], i = (e.checked ? 1 : -1) * t.length;
-      this.updateEquipSelect(e.groupId, t, e.checked, i), this.updateEquipSelectCount(e.groupId, !1, i), this.updateSearchStatusObject(e.groupId, i), this.updateControlCheckStatus(), this.updateGroupCheckStatus();
-    }
+   * 新方案：简化逻辑，只更新设备状态，分组状态由 updateGroupCheckStatus 统一计算
+   */
+  selectEquip(t) {
+    const e = `${t.groupId}-${t.equipNo}`;
+    this.setEquipCheckObject(e, t.checked, !1, t.groupId), this.nodesMap[e] && this.setCheckStatus(e, t.checked, !1), this.updateControlCheckStatus(), this.updateGroupCheckStatus();
   }
   // 更新设备控制项存储
-  updateEquipControl(e, t, i) {
-    this.equipControllObject[e] || (this.equipControllObject[e] = []), i ? this.equipControllObject[e].push(t) : this.equipControllObject[e] = this.equipControllObject[e].filter((o) => o != t);
+  updateEquipControl(t, e, i) {
+    this.equipControllObject[t] || (this.equipControllObject[t] = []), i ? this.equipControllObject[t].push(e) : this.equipControllObject[t] = this.equipControllObject[t].filter((o) => o != e);
   }
   // 触发控制项选择
   /**
-  *  1:更新设备控制项
-  *  2:更新设备选中状态
-     (1)选择情况下：
-          1）如果设备即将全选，清除分组中半选设备、清除设备控制项记录（equipControllObject），分组全选设备数组+1，半选设备数组中有则-1,设置设备全选
-          2) 如果之前设备没选择情况下(非半选情况下)，分组中半选设备数组+1，设置设备半选
-          3）如果设备是半选状态。不做处理
-    （2）取消选择情况下
-          1）如果设备是全选情况下、分组全选设备数组-1
-              1）如果不仅有一个测点，设备半选分组+1，设备控制项（equipControllObject）记录剩余设备，设置设备半选
-              2）如果仅有一个测点，设置设备不选
-          2) 如果设备是半选情况下，如果还是半选，不做处理，如果从半选到不选情况下，分组挂载的半选分组-1，设备控制项有则-1，设置设备不选
-  *  3:更新分组状态
-  *  */
-  selectControl(e) {
-    let t = this.nodesMap[`${e.groupId}-${e.equipNo}`];
-    t && (this.updateEquipControl(e.equipNo, e.setNo, e.checked), e.checked ? t.settings && t.settings.length == this.equipControllObject[e.equipNo].length ? (delete this.equipControllObject[e.equipNo], this.updateEquipSelectCount(e.groupId, !1, 1), this.updateSearchStatusObject(e.groupId, 1), this.nodesMap[e.groupId].halfCheckedEquips = this.nodesMap[e.groupId].halfCheckedEquips.filter((i) => i != e.equipNo), this.setEquipCheckObject(e.equipNo, !0, !1, e.groupId), this.setCheckStatus(`${e.groupId}-${e.equipNo}`, !0, !1)) : t && !t.indeterminate && (this.nodesMap[`${e.groupId}`].halfCheckedEquips.push(e.equipNo), this.setCheckStatus(`${e.groupId}-${e.equipNo}`, !1, !0), this.setEquipCheckObject(e.equipNo, !1, !0, e.groupId)) : t.checked ? (this.updateEquipSelectCount(e.groupId, !1, -1), this.updateSearchStatusObject(e.groupId, -1), t.settings.length > 1 ? (this.nodesMap[e.groupId].halfCheckedEquips.push(e.equipNo), t.settings.map((o) => o.setNo).filter((o) => o != e.setNo).forEach((o) => {
-      this.updateEquipControl(e.equipNo, o, !0);
-    }), this.setEquipCheckObject(e.equipNo, !1, !0, e.groupId), this.setCheckStatus(`${e.groupId}-${e.equipNo}`, !1, !0)) : (this.setEquipCheckObject(e.equipNo, !1, !1, e.groupId), this.setCheckStatus(`${e.groupId}-${e.equipNo}`, !1, !1))) : t.indeterminate && this.equipControllObject[e.equipNo] && !this.equipControllObject[e.equipNo].length && (this.nodesMap[e.groupId].halfCheckedEquips = this.nodesMap[e.groupId].halfCheckedEquips.filter((i) => i != e.equipNo), this.setEquipCheckObject(e.equipNo, !1, !1, e.groupId), this.setCheckStatus(`${e.groupId}-${e.equipNo}`, !1, !1)), this.updateGroupCheckStatus());
+   * 新方案：简化逻辑，只更新控制项和设备状态，分组状态由 updateGroupCheckStatus 统一计算
+   */
+  selectControl(t) {
+    const e = `${t.groupId}-${t.equipNo}`, i = `${t.groupId}-${t.equipNo}-${t.setNo}`, o = this.nodesMap[e];
+    if (!o) { return; }
+    this.updateEquipControl(t.equipNo, t.setNo, t.checked), this.setCheckStatus(i, t.checked, !1);
+    const u = o.settings || [], a = this.equipControllObject[t.equipNo] || [], h = u.length, r = a.length;
+    t.checked ? r === h ? (delete this.equipControllObject[t.equipNo], this.setEquipCheckObject(e, !0, !1, t.groupId), this.setCheckStatus(e, !0, !1)) : (this.setEquipCheckObject(e, !1, !0, t.groupId), this.setCheckStatus(e, !1, !0)) : r === 0 ? (this.setEquipCheckObject(e, !1, !1, t.groupId), this.setCheckStatus(e, !1, !1)) : (this.setEquipCheckObject(e, !1, !0, t.groupId), this.setCheckStatus(e, !1, !0)), this.updateGroupCheckStatus();
   }
 }
-class v extends N {
+class B extends m {
   // 分组节点扁平化对象、设备扁平化对象、window缓存设备扁平化对象
-  constructor(e, t) {
-    super(), this.aliasName = t, this.groupNodeObject = e;
+  constructor(t, e) {
+    super(), this.aliasName = e, this.groupNodeObject = t;
   }
   // 重新计算分组设备数量
-  resetGroupNum(e) {
+  resetGroupNum(t, e, i) {
     this.clearAllEquipNum();
-    for (let t in this.groupNodeObject) {
-      let i = [];
-      e ? i = this.window[`group-${t}-search`] : i = this.window[`group-${t}${this.aliasName}`];
-      let o = i ? i.length : 0;
-      o && (this.groupNodeObject[t].equipCount = o, this.setGroupNum(t, o));
+    for (let o in this.groupNodeObject) {
+      let u = [];
+      t ? u = this.window[`group-${o}-search`] : u = this.window[`group-${o}${this.aliasName}`], e && u && u.length && (u = u.filter((h) => i[h.equipNo] === 2));
+      let a = u ? u.length : 0;
+      this.groupNodeObject[o].equipCount = a, a && this.setGroupNum(o, a);
     }
   }
   clearAllEquipNum() {
-    for (let e in this.groupNodeObject) { this.groupNodeObject[e].equipCount = 0, this.groupNodeObject[e].count = 0; }
+    for (let t in this.groupNodeObject) { this.groupNodeObject[t].equipCount = 0, this.groupNodeObject[t].count = 0; }
   }
   // 设置分组设备数量
-  setGroupNum(e, t) {
-    this.groupNodeObject[e] && (this.groupNodeObject[e].count = Number(this.groupNodeObject[e].count) + Number(t), this.setGroupNum(this.groupNodeObject[e].groupId, t));
+  setGroupNum(t, e) {
+    this.groupNodeObject[t] && (this.groupNodeObject[t].count = Number(this.groupNodeObject[t].count) + Number(e), this.setGroupNum(this.groupNodeObject[t].groupId, e));
   }
   // 获取设备总数
   getAllEquipsNum() {
-    let e = 0;
-    for (let t in this.groupNodeObject) { this.window[`group-${this.groupNodeObject[t].key}${this.aliasName}`] && (e = e + this.window[`group-${this.groupNodeObject[t].key}${this.aliasName}`].length); }
-    return e;
+    let t = 0;
+    for (let e in this.groupNodeObject) { this.window[`group-${this.groupNodeObject[e].key}${this.aliasName}`] && (t = t + this.window[`group-${this.groupNodeObject[e].key}${this.aliasName}`].length); }
+    return t;
   }
 }
 class $ {
-  constructor(e, t, i) {
-    this.url = e, this.connectionId = t, this.equipNo = i, this.signalr = null;
+  constructor(t, e, i) {
+    this.url = t, this.connectionId = e, this.equipNo = i, this.signalr = null;
   }
   openConnect() {
-    return this.signalr && (this.signalr.stop(), this.signalr = null), this.signalr = new y.HubConnectionBuilder().withUrl(this.url).build(), this.signalr.serverTimeoutInMilliseconds = 5e8, this.signalr.keepaliveintervalinmilliseconds = 5e8, new Promise((e) => {
+    return this.signalr && (this.signalr.stop(), this.signalr = null), this.signalr = new T.HubConnectionBuilder().withUrl(this.url).build(), this.signalr.serverTimeoutInMilliseconds = 5e8, this.signalr.keepaliveintervalinmilliseconds = 5e8, new Promise((t) => {
       this.signalr.start().then(() => {
-        this.connectionId && this.send(), e(this.signalr);
-      }).catch((t) => {
-        console.log(t);
+        this.connectionId && this.send(), t(this.signalr);
+      }).catch((e) => {
+        console.log(e);
       });
     });
   }
   async send() {
     try {
       await this.signalr.invoke(this.connectionId, this.equipNo);
-    } catch (e) {
-      console.log("connectHub 连接失败" + e);
+    } catch (t) {
+      console.log("connectHub 连接失败" + t);
     }
   }
 }
-class A extends N {
-  constructor(e, t, i, o, u) {
-    super(), this.equipStatusObject = t, this.groupNodeObject = i, this.aleadyUpdateStatus = {}, this.isGetAllEquipStatus = !1, this.nodesMap = e, this.statusChange = o, this.openSignlr(), this.aliasName = u;
+class U extends m {
+  constructor(t, e, i, o, u) {
+    super(), this.equipStatusObject = e, this.groupNodeObject = i, this.aleadyUpdateStatus = {}, this.isGetAllEquipStatus = !1, this.nodesMap = t, this.statusChange = o, this.openSignlr(), this.aliasName = u;
   }
   openSignlr() {
-    this.equipStatusSignlr = new $("/equipStatusMonitor", "", ""), this.equipStatusSignlr.openConnect().then((e) => {
+    this.equipStatusSignlr = new $("/equipStatusMonitor", "", ""), this.equipStatusSignlr.openConnect().then((t) => {
       try {
-        e.invoke("GetAllEquipStatus");
-      } catch (t) {
-        console.log(t);
+        t.invoke("GetAllEquipStatus");
+      } catch (e) {
+        console.log(e);
       }
-      this.subscribeTo(e, "GetAllEquipStatus");
+      this.subscribeTo(t, "GetAllEquipStatus");
       try {
-        e.invoke("GetEquipChangeStatus");
-      } catch (t) {
-        console.log(t);
+        t.invoke("GetEquipChangeStatus");
+      } catch (e) {
+        console.log(e);
       }
-      e.onclose(() => {
+      t.onclose(() => {
         this.openSignlr();
-      }), this.subscribeTo(e, "GetEquipChangeStatus");
+      }), this.subscribeTo(t, "GetEquipChangeStatus");
     });
   }
-  subscribeTo(e, t) {
-    e.off(t), e.on(t, (i) => {
-      i && i.isSuccess && i.data && (this[t] ? this[t](i.data) : this.notice({ func: t, data: i.data, key: i.groupId }));
+  subscribeTo(t, e) {
+    t.off(e), t.on(e, (i) => {
+      i && i.isSuccess && i.data && (this[e] ? this[e](i.data) : this.notice({ func: e, data: i.data, key: i.groupId }));
     });
   }
-  GetAllEquipStatus(e) {
-    this.isGetAllEquipStatus = !0, this.resetGroupStatus(), Object.keys(e).forEach((t) => {
-      this.equipStatusObject[t] = e[t];
-    }), Object.keys(this.groupNodeObject).forEach((t) => {
-      this.updateByGroup(t);
+  GetAllEquipStatus(t) {
+    this.isGetAllEquipStatus = !0, this.resetGroupStatus(), Object.keys(t).forEach((e) => {
+      this.equipStatusObject[e] = t[e];
+    }), Object.keys(this.groupNodeObject).forEach((e) => {
+      this.updateByGroup(e);
     });
   }
-  updateByGroup(e) {
-    if (!this.aleadyUpdateStatus[e]) {
-      let t = this.window[`group-${e}${this.aliasName}`] || [];
-      t.length && (this.aleadyUpdateStatus[e] = !0, t.forEach((i) => {
-        this.equipStatusObject[i.equipNo] == 0 || this.equipStatusObject[i.equipNo] == 2 ? this.setGroupStatus(e, !0, 2) : this.equipStatusObject[i.equipNo] == 6 && this.setGroupStatus(e, !0, 6), this.nodesMap[`${e}-${i.equipNo}`] && (this.nodesMap[`${e}-${i.equipNo}`].status = this.equipStatusObject[i.equipNo]);
+  updateByGroup(t) {
+    if (!this.aleadyUpdateStatus[t]) {
+      let e = this.window[`group-${t}${this.aliasName}`] || [];
+      e.length && (this.aleadyUpdateStatus[t] = !0, e.some((i) => this.equipStatusObject[i.equipNo] == 0) && !e.some((i) => this.equipStatusObject[i.equipNo] == 2 || this.equipStatusObject[i.equipNo] == 6) && this.setOfflineStatus(t, e), e.forEach((i) => {
+        this.equipStatusObject[i.equipNo] == 2 ? this.setGroupStatus(t, !0, 2) : this.equipStatusObject[i.equipNo] == 6 && this.setGroupStatus(t, !0, 6), this.nodesMap[`${t}-${i.equipNo}`] && (this.nodesMap[`${t}-${i.equipNo}`].status = this.equipStatusObject[i.equipNo]);
       }));
     }
   }
-  updateGroupStatus(e) {
-    this.isGetAllEquipStatus && this.updateByGroup(e);
+  updateGroupStatus(t) {
+    this.isGetAllEquipStatus && this.updateByGroup(t);
   }
-  GetEquipChangeStatus(e) {
-    this.setStatus(e);
+  GetEquipChangeStatus(t) {
+    this.setStatus(t);
   }
   // 设置分组状态 key:扁平化数据中节点索引；type:类型（增加，减少）；status:状态（报警2、双机热备6）
-  setGroupStatus(e, t, i) {
-    t ? i == 2 ? (this.nodesMap[e].alarmCounts = this.nodesMap[e].alarmCounts + 1, this.nodesMap[e].alarmCounts > 0 && (this.nodesMap[e].status = 2)) : (this.nodesMap[e].backUpCounts = this.nodesMap[e].backUpCounts + 1, this.nodesMap[e].alarmCounts == 0 && this.nodesMap[e].backUpCounts > 0 && (this.nodesMap[e].status = 6)) : i == 2 ? (this.nodesMap[e].alarmCounts = this.nodesMap[e].alarmCounts - 1, this.nodesMap[e].alarmCounts == 0 && (this.nodesMap[e].status = 1)) : (this.nodesMap[e].backUpCounts = this.nodesMap[e].backUpCounts - 1, this.nodesMap[e].alarmCounts == 0 && (this.nodesMap[e].backUpCounts == 0 ? this.nodesMap[e].status = 1 : this.nodesMap[e].status = 6)), this.nodesMap[e].groupId && this.setGroupStatus(this.nodesMap[e].groupId, t, i);
+  setGroupStatus(t, e, i) {
+    e ? i == 2 ? (this.nodesMap[t].alarmCounts = this.nodesMap[t].alarmCounts + 1, this.nodesMap[t].alarmCounts > 0 && (this.nodesMap[t].status = 2)) : (this.nodesMap[t].backUpCounts = this.nodesMap[t].backUpCounts + 1, this.nodesMap[t].alarmCounts == 0 && this.nodesMap[t].backUpCounts > 0 && (this.nodesMap[t].status = 6)) : i == 2 ? (this.nodesMap[t].alarmCounts = this.nodesMap[t].alarmCounts - 1, this.nodesMap[t].alarmCounts == 0 && (this.nodesMap[t].status = 1)) : (this.nodesMap[t].backUpCounts = this.nodesMap[t].backUpCounts - 1, this.nodesMap[t].alarmCounts == 0 && (this.nodesMap[t].backUpCounts == 0 ? this.nodesMap[t].status = 1 : this.nodesMap[t].status = 6)), this.nodesMap[t].groupId && this.setGroupStatus(this.nodesMap[t].groupId, e, i);
+  }
+  setOfflineStatus(t) {
+    this.nodesMap[t].status != 2 && this.nodesMap[t].status != 6 && (this.nodesMap[t].status = 0, this.nodesMap[t].groupId && this.setOfflineStatus(this.nodesMap[t].groupId));
+  }
+  // 获取设备所属的所有分组ID
+  // 优先从 groupCache 反查（按分组隔离存储，数据准确），兜底从 equipCache 获取
+  getEquipGroupIds(t) {
+    const e = [];
+    if (this.window.groupCache && Object.keys(this.window.groupCache).forEach((i) => {
+      this.window.groupCache[i] && this.window.groupCache[i][t] && e.push(Number(i));
+    }), e.length === 0) {
+      const i = this.window.equipCache && this.window.equipCache[t];
+      if (i) {
+        if (i.groupIds && i.groupIds.length > 0) { return i.groupIds; }
+        i.groupId && e.push(i.groupId);
+      }
+    }
+    return e;
   }
-  setStatus(e) {
-    let t = this.equipStatusObject[e.equipNo], i = this.window.equipCache && this.window.equipCache[e.equipNo] && this.window.equipCache[e.equipNo].groupId;
-    if (e.status != 3 && i) {
-      switch (e.status) {
+  setStatus(t) {
+    let e = this.equipStatusObject[t.equipNo];
+    const i = this.getEquipGroupIds(t.equipNo);
+    t.status != 3 && i.length > 0 && (i.forEach((o) => {
+      switch (t.status) {
         case 0:
-          t != 0 && this.setGroupStatus(i, !0, 2), t == 6 && this.setGroupStatus(i, !1, 6);
+          e == 6 && this.setGroupStatus(o, !1, 6);
           break;
         case 1:
-          t == 6 ? this.setGroupStatus(i, !1, 6) : (t == 2 || t == 0) && this.setGroupStatus(i, !1, 2);
+          e == 6 ? this.setGroupStatus(o, !1, 6) : e == 2 && this.setGroupStatus(o, !1, 2);
           break;
         case 2:
-          t != 2 && this.setGroupStatus(i, !0, 2), t == 6 && this.setGroupStatus(i, !1, 6);
+          e != 2 && this.setGroupStatus(o, !0, 2), e == 6 && this.setGroupStatus(o, !1, 6);
           break;
         case 6:
-          (t == 2 || t == 0) && this.setGroupStatus(i, !1, 2), t != 6 && this.setGroupStatus(i, !0, 6);
+          e == 2 && this.setGroupStatus(o, !1, 2), e != 6 && this.setGroupStatus(o, !0, 6);
           break;
       }
-      this.equipStatusObject[e.equipNo] = e.status;
-      let o = `${i}-${e.equipNo}`;
-      this.nodesMap[o] && (this.nodesMap[o].status = e.status), this.statusChange(i, e.equipNo, e.status);
-    }
+      let u = `${o}-${t.equipNo}`;
+      this.nodesMap[u] && (this.nodesMap[u].status = t.status);
+    }), this.equipStatusObject[t.equipNo] = t.status, this.statusChange(i[0], t.equipNo, t.status));
   }
   // 重置分组状态
   resetGroupStatus() {
-    for (let e in this.groupNodeObject) { this.groupNodeObject[e].alarmCounts = 0, this.groupNodeObject[e].backUpCount = 0; }
+    for (let t in this.groupNodeObject) { this.groupNodeObject[t].alarmCounts = 0, this.groupNodeObject[t].backUpCount = 0; }
   }
 }
-const B = {
+const W = {
   getSetParm(s) {
-    if (window.axios) {
- return window.axios({
+    if (window.AxiosBuilder.axios) {
+ return window.AxiosBuilder.axios({
         method: "post",
         url: "/IoT/api/v3/EquipList/GetFullSetParmByEquipNo",
         params: s,
-        data: s
+        data: s,
+        headers: {
+          "Content-Type": "application/json;charset=UTF-8",
+          "Accept-Language": window.sessionStorage.languageType || "zh-CN"
+        }
       }); 
 }
   }
-}, U = Object.assign(
+}, K = Object.assign(
   {},
-  B
+  W
 );
-class W {
-  constructor(e, t) {
-    this.nodesMap = e, this.equipControllObject = t;
+class D {
+  constructor(t, e) {
+    this.nodesMap = t, this.equipControllObject = e;
   }
   // 获取设备控制项
-  async getSetting(e, t, i, o) {
-    let [u, a] = String(e).split("-"), r = {
+  async getSetting(t, e, i, o) {
+    let [u, a] = String(t).split("-"), h = {
       equipNo: a
     };
-    await U.getSetParm(r).then((h) => {
-      if (h.data.code == 200) {
-        let c = h && h.data && h.data.data && h.data.data.rows || [];
-        this.nodesMap[e].settings || (this.nodesMap[e].settings = []), c && c.length > 0 && this.nodesMap[e] && (c.forEach((p) => {
-          p.title = p.setNm, p.key = `${u}-${a}-${p.setNo}`, p.level = Number(i) + 1, p.checked = o || this.equipControllObject[a] && this.equipControllObject[a].includes(p.setNo), p.isSetting = !0, p.equipNo = a, p.groupId = u, p.equipName = t;
-        }), this.nodesMap[e].settings = [...c]);
+    await K.getSetParm(h).then((r) => {
+      if (r.data.code == 200) {
+        let n = r && r.data && r.data.data && r.data.data.rows || [];
+        this.nodesMap[t].settings || (this.nodesMap[t].settings = []), n && n.length > 0 && this.nodesMap[t] && (n.forEach((c) => {
+          c.title = c.setNm, c.key = `${u}-${a}-${c.setNo}`, c.level = Number(i) + 1, c.checked = o || this.equipControllObject[a] && this.equipControllObject[a].includes(c.setNo), c.isSetting = !0, c.equipNo = a, c.groupId = u, c.setNo = c.setNo, c.equipName = e;
+        }), this.nodesMap[t].settings = [...n]);
       }
     });
   }
 }
-class d {
-  static formateList(e, t) {
+class f {
+  static formateList(t, e) {
     let i = [];
-    for (const o of e) {
+    for (const o of t) {
       let u = {};
-      u.count = 0, u.equipSelectCount = 0, u.controlSelectCount = 0, u.equipCount = o.equipCount || 0, u.title = o.name, u.key = o.id, u.isGroup = !0, u.children = [], u.status = 1, u.level = t || 1, u.expand = !t, u.equips = [], u.groupId = o.parentId, u.groups = [], u.alarmCounts = 0, u.backUpCounts = 0, u.indeterminate = !1, u.checked = !1, u.visible = !0, u.nodeEquipSelectCount = 0, u.checkedEquips = [], u.halfCheckedEquips = [], u.selectControlCount = 0, o.children && o.children.length > 0 && (u.groups = [
-        ...this.formateList(o.children, t ? t + 1 : 2)
+      u.count = 0, u.equipSelectCount = 0, u.controlSelectCount = 0, u.equipCount = o.equipCount || 0, u.title = o.name, u.key = o.id, u.isGroup = !0, u.children = [], u.status = 1, u.level = e || 1, u.expand = !e, u.equips = [], u.groupId = o.parentId, u.groups = [], u.alarmCounts = 0, u.backUpCounts = 0, u.indeterminate = !1, u.checked = !1, u.visible = !0, u.nodeEquipSelectCount = 0, u.checkedEquips = [], u.halfCheckedEquips = [], u.selectControlCount = 0, o.children && o.children.length > 0 && (u.groups = [
+        ...this.formateList(o.children, e ? e + 1 : 2)
       ]), i.push(u);
     }
     return i;
   }
-  static deepClone(e, t, i, o, u, a) {
-    let r = [];
-    if (e) {
- for (let h = 0, c = e.length; h < c; h++) {
- r.push(
+  static deepClone(t, e, i, o, u, a) {
+    let h = [];
+    if (t) {
+ for (let r = 0, n = t.length; r < n; r++) {
+ h.push(
           {
             isGroup: i,
-            key: `${o}-${e[h].id}`,
-            status: a[e[h].id] || 0,
-            title: e[h].title,
-            level: t,
+            key: `${o}-${t[r].id}`,
+            status: a[t[r].id] || 0,
+            title: t[r].title,
+            level: e,
             expand: !1,
             isEquip: !0,
             loading: !1,
-            indeterminate: u[e[h].equipNo] && u[e[h].equipNo].indeterminate || !1,
-            checked: u[e[h].equipNo] && u[e[h].equipNo].checked || !1,
+            indeterminate: u[`${t[r].groupId}-${t[r].equipNo}`] && u[`${t[r].groupId}-${t[r].equipNo}`].indeterminate || !1,
+            checked: u[`${t[r].groupId}-${t[r].equipNo}`] && u[`${t[r].groupId}-${t[r].equipNo}`].checked || !1,
             groupId: o,
-            equipNo: e[h].id,
+            equipNo: t[r].id,
             visible: !0,
             settings: []
           }
         ); 
 } 
 }
-    return r;
+    return h;
   }
-  static copyOrigin(e) {
-    let t = [];
-    return e.forEach((i) => {
-      t.push({ ...i });
-    }), t;
+  static copyOrigin(t) {
+    let e = [];
+    return t.forEach((i) => {
+      e.push({ ...i });
+    }), e;
   }
   // 获取分组位置
-  static getPosition(e, t) {
+  static getPosition(t, e) {
     let i = 0;
-    for (let o = 0, u = t.length; o < u; o++) {
- if (t[o].key == e) {
+    for (let o = 0, u = e.length; o < u; o++) {
+ if (e[o].key == t) {
         i = o - 30;
         break;
       } 
@@ -541,9 +547,9 @@ class d {
     return i;
   }
   // 扁平化
-  static flattern(e, t) {
-    e.forEach((i) => {
-      i.isGroup && (t[`${i.key}`] = null, t[`${i.key}`] = i), i.groups && i.groups.length && this.flattern(i.groups, t);
+  static flattern(t, e) {
+    t.forEach((i) => {
+      i.isGroup && (e[`${i.key}`] = null, e[`${i.key}`] = i), i.groups && i.groups.length && this.flattern(i.groups, e);
     });
   }
 
@@ -553,10 +559,10 @@ class d {
     * @return {string}
   */
   static generateUUID() {
-    let e = (/* @__PURE__ */ new Date()).getTime();
-    return window.performance && typeof window.performance.now == "function" && (e += performance.now()), "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(i) {
-      let o = (e + Math.random() * 16) % 16 | 0;
-      return e = Math.floor(e / 16), (i === "x" ? o : o & 3 | 8).toString(16);
+    let t = (/* @__PURE__ */ new Date()).getTime();
+    return window.performance && typeof window.performance.now == "function" && (t += performance.now()), "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(i) {
+      let o = (t + Math.random() * 16) % 16 | 0;
+      return t = Math.floor(t / 16), (i === "x" ? o : o & 3 | 8).toString(16);
     });
   }
 
@@ -565,97 +571,107 @@ class d {
      * @param {list} 可构建树形结构的普通列表  
      * @return {string}
   */
-  static listToTreeList(e) {
-    const t = e, i = [], o = {};
-    return t.forEach((u) => {
+  static listToTreeList(t) {
+    const e = t, i = [], o = {};
+    return e.forEach((u) => {
       o[u.id] = u;
-    }), t.forEach((u) => {
+    }), e.forEach((u) => {
       const a = o[u.parentId];
       a ? (a.children || (a.children = [])).push(u) : i.push(u);
     }), i;
   }
 }
-class D extends N {
+class F extends m {
   // 分组节点扁平化对象、设备扁平化对象、window缓存设备扁平化对象
-  constructor(e, t, i) {
-    super(), this.showSettings = t, this.groupNodeObject = e, this.aliasName = i;
+  constructor(t, e, i) {
+    super(), this.showSettings = e, this.groupNodeObject = t, this.aliasName = i;
   }
   // 触发搜索
-  filterMethod(e) {
-    for (let t in this.groupNodeObject) { e && this.updateBySearch(t, e); }
+  filterMethod(t) {
+    for (let e in this.groupNodeObject) { t && this.updateBySearch(e, t); }
   }
   // 搜索状态将搜索的结果存放缓存中
-  updateBySearch(e, t) {
-    let i = this.window[`group-${this.groupNodeObject[e].key}${this.aliasName}`];
-    i && (i = i.filter((o) => o.title.includes(t)), this.window[`group-${this.groupNodeObject[e].key}-search`] = d.copyOrigin(i));
+  updateBySearch(t, e) {
+    let i = this.window[`group-${this.groupNodeObject[t].key}${this.aliasName}`];
+    i && (i = i.filter((o) => o.title.includes(e)), this.window[`group-${this.groupNodeObject[t].key}-search`] = f.copyOrigin(i));
   }
 }
-const E = (s, e) => {
-  const t = s.__vccOpts || s;
-  for (const [i, o] of e) { t[i] = o; }
-  return t;
-}, K = {
+const O = (s, t) => {
+  const e = s.__vccOpts || s;
+  for (const [i, o] of t) { e[i] = o; }
+  return e;
+}, J = {
   props: {
     source: {
-      type: Object
+      type: Object,
+      default: () => {
+      }
     },
     groupEditAndNew: {
-      type: Function
+      type: Function,
+      default: () => {
+      }
     },
     deleteGroup: {
-      type: Function
+      type: Function,
+      default: () => {
+      }
     }
   }
-}, F = { class: "operates" };
-function J(s, e, t, i, o, u) {
-  const a = g("el-button"), r = g("el-button-group"), h = g("el-popover");
-  return n(), l("div", F, [
-    q(h, {
+}, V = { class: "operates" };
+function P(s, t, e, i, o, u) {
+  const a = C("el-button"), h = C("el-button-group"), r = C("el-popover");
+  return p(), d("div", V, [
+    b(r, {
       placement: "bottom",
       trigger: "hover"
     }, {
-      reference: w(() => e[3] || (e[3] = [
-        C("i", { class: "el-icon-more" }, null, -1)
-      ])),
-      default: w(() => [
-        q(r, { class: "new-button-group setModule" }, {
-          default: w(() => [
-            q(a, {
+      reference: q(() => [
+        S("i", {
+          class: "el-icon-more",
+          onClick: t[3] || (t[3] = k(() => {
+          }, ["stop"]))
+        })
+      ]),
+      default: q(() => [
+        b(h, { class: "new-button-group setModule" }, {
+          default: q(() => [
+            b(a, {
               type: "text",
               size: "small",
               class: "elBtn",
               icon: " iconfont icon-tubiao20_bianji",
-              onClick: e[0] || (e[0] = M((c) => t.groupEditAndNew(!1, t.source), ["stop"]))
+              onClick: t[0] || (t[0] = k((n) => e.groupEditAndNew(!1, e.source), ["stop"]))
             }, {
-              default: w(() => [
-                k(b(s.$t("equipInfo.poverTips.rename")), 1)
+              default: q(() => [
+                M(N(s.$t("equipInfo.poverTips.rename")), 1)
               ]),
               _: 1
             }),
-            q(a, {
+            b(a, {
               type: "text",
               size: "small",
               class: "elBtn",
               icon: " iconfont icon-gw-icon-tianjia1",
-              onClick: e[1] || (e[1] = (c) => t.groupEditAndNew(!0, t.source))
+              onClick: t[1] || (t[1] = (n) => e.groupEditAndNew(!0, e.source))
             }, {
-              default: w(() => [
-                k(b(s.$t("equipInfo.poverTips.newChildGroup")), 1)
+              default: q(() => [
+                M(N(s.$t("equipInfo.poverTips.newChildGroup")), 1)
               ]),
               _: 1
             }),
-            t.source.level != 1 ? (n(), S(a, {
+            e.source.level != 1 ? (p(), E(a, {
               key: 0,
               type: "danger",
               size: "small",
-              onClick: e[2] || (e[2] = M((c) => t.deleteGroup(t.source), ["stop"])),
+              onClick: t[2] || (t[2] = k((n) => e.deleteGroup(e.source), ["stop"])),
               icon: " iconfont icon-tubiao20_shanchu"
             }, {
-              default: w(() => [
-                k(b(s.$t("publics.button.deletes")), 1)
+              default: q(() => [
+                M(N(s.$t("publics.button.deletes")), 1)
               ]),
               _: 1
-            })) : f("", !0)
+            })) : w("", !0)
           ]),
           _: 1
         })
@@ -664,7 +680,7 @@ function J(s, e, t, i, o, u) {
     })
   ]);
 }
-const V = /* @__PURE__ */ E(K, [["render", J]]), P = {
+const z = /* @__PURE__ */ O(J, [["render", P]]), R = {
   name: "ElTreeVirtualNode",
   componentName: "ElTreeVirtualNode",
   props: {
@@ -718,8 +734,16 @@ const V = /* @__PURE__ */ E(K, [["render", J]]), P = {
     deleteGroup: {
       type: Function
     },
+    childrenResetGroupNum: {
+      type: Function
+    },
+    getEquipStatus: {
+      type: Function
+    },
     colorConfig: {
-      type: Object
+      type: Object,
+      default: () => {
+      }
     },
     index: {
       type: Number,
@@ -727,39 +751,48 @@ const V = /* @__PURE__ */ E(K, [["render", J]]), P = {
     }
   },
   components: {
-    oparate: V
+    oparate: z
   },
   computed: {
     getColor() {
       return function(s) {
-        let e;
+        this.colorConfig || (this.colorConfig = {
+          noComm: "#a0a0a0",
+          normal: "#63e03f",
+          alarm: "#f22433",
+          lsSet: "#bebcaa",
+          initialize: "#289ac0",
+          withdraw: "#ffc0cb",
+          BackUp: "#f8901c"
+        });
+        let t;
         switch (s) {
           case 0:
-            e = this.colorConfig.noComm;
+            t = this.colorConfig.noComm;
             break;
           case 1:
-            e = this.colorConfig.normal;
+            t = this.colorConfig.normal;
             break;
           case 2:
-            e = this.colorConfig.alarm;
+            t = this.colorConfig.alarm;
             break;
           case 3:
-            e = this.colorConfig.lsSet;
+            t = this.colorConfig.lsSet;
             break;
           case 4:
-            e = this.colorConfig.initialize;
+            t = this.colorConfig.initialize;
             break;
           case 5:
-            e = this.colorConfig.withdraw;
+            t = this.colorConfig.withdraw;
             break;
           case 6:
-            e = this.colorConfig.BackUp;
+            t = this.colorConfig.BackUp;
             break;
           default:
-            e = this.colorConfig.noComm;
+            t = this.colorConfig.noComm;
             break;
         }
-        return e;
+        return t;
       };
     }
   },
@@ -776,83 +809,85 @@ const V = /* @__PURE__ */ E(K, [["render", J]]), P = {
       this.onChecked(this.source);
     }
   }
-}, H = { class: "el-tree-node__content" }, z = { class: "nodeContent" }, R = {
+}, H = { class: "el-tree-node__content" }, Q = { class: "nodeContent" }, X = {
   key: 1,
   class: "circle"
-}, Q = { class: "label" }, X = {
+}, Y = { class: "label" }, Z = {
   key: 2,
   class: "equipNumber"
-}, Y = {
+}, tt = {
   key: 4,
   class: "el-tree-node__loading-icon el-icon-loading"
 };
-function Z(s, e, t, i, o, u) {
-  const a = g("el-checkbox"), r = g("oparate");
-  return n(), l("div", {
-    class: G(["el-tree-node", {
-      parent_tag: t.source.isGroup,
-      child_tags: !t.source.isGroup,
-      selectedColor: t.currentSelect === t.source.key && !t.source.isGroup
+function et(s, t, e, i, o, u) {
+  const a = C("el-checkbox"), h = C("oparate");
+  return p(), d("div", {
+    class: y(["el-tree-node", {
+      parent_tag: e.source.isGroup,
+      child_tags: !e.source.isGroup,
+      selectedColor: e.currentSelect === e.source.key && !e.source.isGroup
     }]),
-    onClick: e[1] || (e[1] = (...h) => u.clickFunction && u.clickFunction(...h))
+    onClick: t[2] || (t[2] = (...r) => u.clickFunction && u.clickFunction(...r))
   }, [
-    C("div", H, [
-      C("span", {
+    S("div", H, [
+      S("span", {
         class: "el-tree__indent",
         "aria-hidden": "true",
-        style: O({ width: (t.source.level - 1) * o.indent + "px" })
+        style: G({ width: (e.source.level - 1) * o.indent + "px" })
       }, null, 4),
-      t.source.isGroup ? (n(), l("span", {
+      e.source.isGroup ? (p(), d("span", {
         key: 0,
-        class: G([
+        class: y([
           {
-            "is-leaf": !t.source.isGroup,
-            expanded: t.source.isGroup && t.source.expand
+            "is-leaf": !e.source.isGroup,
+            expanded: e.source.isGroup && e.source.expand
           },
           "el-tree-node__expand-icon",
-          "el-icon-arrow-right"
+          "iconfont icon-fangxiangL"
         ])
-      }, null, 2)) : f("", !0),
-      C("div", z, [
-        t.showCheckbox ? (n(), S(a, {
+      }, null, 2)) : w("", !0),
+      S("div", Q, [
+        e.showCheckbox ? (p(), E(a, {
           key: 0,
-          modelValue: t.source.checked,
-          "onUpdate:modelValue": e[0] || (e[0] = (h) => t.source.checked = h),
-          indeterminate: t.source.indeterminate,
+          onClick: t[0] || (t[0] = k(() => {
+          }, ["stop"])),
+          modelValue: e.source.checked,
+          "onUpdate:modelValue": t[1] || (t[1] = (r) => e.source.checked = r),
+          indeterminate: e.source.indeterminate,
           onChange: u.checkedChange
-        }, null, 8, ["modelValue", "indeterminate", "onChange"])) : f("", !0),
-        t.showStatus ? (n(), l("span", R, [
-          t.source.status != 6 ? (n(), l("span", {
+        }, null, 8, ["modelValue", "indeterminate", "onChange"])) : w("", !0),
+        e.showStatus ? (p(), d("span", X, [
+          e.source.status != 6 ? (p(), d("span", {
             key: 0,
             class: "yd",
-            style: O({ backgroundColor: u.getColor(t.source.status) })
-          }, null, 4)) : (n(), l("i", {
+            style: G({ backgroundColor: u.getColor(e.source.status) })
+          }, null, 4)) : (p(), d("i", {
             key: 1,
-            style: O({ color: t.colorConfig.BackUp }),
+            style: G({ color: e.colorConfig.BackUp }),
             class: "iconfont icon-gw-icon-beiji2"
           }, null, 4))
-        ])) : f("", !0),
-        C("span", Q, b(t.source.title), 1),
-        t.source.isGroup && !t.source.isEquip || t.source.isGroup && !t.source.isEquip ? (n(), l("span", X, b(t.source.count), 1)) : f("", !0),
-        t.source.isGroup && t.showOperate ? (n(), S(r, {
+        ])) : w("", !0),
+        S("span", Y, N(e.source.title), 1),
+        e.source.isGroup && !e.source.isEquip || e.source.isGroup && !e.source.isEquip ? (p(), d("span", Z, N(e.source.count), 1)) : w("", !0),
+        e.source.isGroup && e.showOperate ? (p(), E(h, {
           key: 3,
-          source: t.source,
-          groupEditAndNew: t.groupEditAndNew,
-          deleteGroup: t.deleteGroup
-        }, null, 8, ["source", "groupEditAndNew", "deleteGroup"])) : f("", !0),
-        t.source.loading ? (n(), l("span", Y)) : f("", !0)
+          source: e.source,
+          groupEditAndNew: e.groupEditAndNew,
+          deleteGroup: e.deleteGroup
+        }, null, 8, ["source", "groupEditAndNew", "deleteGroup"])) : w("", !0),
+        e.source.loading ? (p(), d("span", tt)) : w("", !0)
       ])
     ])
   ], 2);
 }
-const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
+const it = /* @__PURE__ */ O(R, [["render", et]]), st = {
   components: {
     VirtualList: I
   },
-  mixins: [m],
+  mixins: [x],
   data() {
     return {
-      itemComponent: ee,
+      itemComponent: it,
       //节点组件
       visibleList: [],
       //虚拟滚动所需要的列表
@@ -886,7 +921,9 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       //绑定所有的已选中的设备控制项
       expandGroup: [],
       //记录已展开的分组
-      updateJob: null
+      updateJob: null,
+      filterEquipList: []
+      //过滤条件下新增的设备列表，由于设备开始状态都是0，因而需要单独维护
     };
   },
   props: {
@@ -895,8 +932,8 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       type: Array
     },
     selectEquips: {
-      //设备选中列表，用于回显，如权限管理
-      type: Array,
+      //设备选中列表，用于回显，如权限管理。支持数组格式 [equipNo] 或对象格式 { groupId: [equipNo] }
+      type: [Array, Object],
       default: () => []
     },
     controllList: {
@@ -926,6 +963,11 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       type: Boolean,
       default: !1
     },
+    filterEquip: {
+      //是否过滤
+      type: Boolean,
+      default: !1
+    },
     showOperate: {
       // 是否展示操作按钮
       type: Boolean,
@@ -953,10 +995,14 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       default: ""
     },
     buildTree: {
-      type: Function
+      type: Function,
+      default: () => {
+      }
     },
     filterData: {
-      type: Function
+      type: Function,
+      default: () => {
+      }
     },
     alias: {
       type: String,
@@ -965,13 +1011,20 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
   },
   watch: {
     data(s) {
-      s && s.length && (d.flattern(this.data, this.groupNodeObject), this.cacheManage.addNodesMap(Object.values(this.groupNodeObject).map((e) => e)), this.init());
+      s && s.length && (f.flattern(this.data, this.groupNodeObject), this.cacheManage.addNodesMap(Object.values(this.groupNodeObject).map((t) => t)), this.init());
     },
     controllList(s) {
       this.updateCheckedStatusWithControls();
     },
     selectEquips(s) {
-      this.updateCheckedStatusWithEquips();
+      this.updateCheckedStatusWithEquips(), this.$nextTick(() => {
+        this.checkStatusManage && this.checkStatusManage.updateGroupCheckStatus();
+      });
+    },
+    filterEquip(s) {
+      this.$nextTick(() => {
+        this.visibleList = [], this.$refs.virtualList.scrollToIndex(0), this.updateTreeList(this.data), this.equipNumManage.resetGroupNum(this.isSearchStatus, s, this.equipStatusObject);
+      });
     }
   },
   computed: {
@@ -980,7 +1033,7 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
     }
   },
   created() {
-    this.showCheckbox && (this.checkStatusManage = new L(this.groupNodeObject, this.nodesMap, this.equipControllObject, this.controlObject, this.equipCheckObject, this.aliasName)), this.cacheManage = new _(this.groupNodeObject, this.nodesMap, this.controlObject, this.equipCheckObject), this.searchManage = new D(this.groupNodeObject, this.showSettings, this.aliasName), this.equipNumManage = new v(this.groupNodeObject, this.aliasName), this.requestManage = new W(this.nodesMap, this.equipControllObject);
+    this.showCheckbox && (this.checkStatusManage = new A(this.groupNodeObject, this.nodesMap, this.equipControllObject, this.controlObject, this.equipCheckObject, this.aliasName)), this.cacheManage = new v(this.groupNodeObject, this.nodesMap, this.controlObject, this.equipCheckObject), this.searchManage = new F(this.groupNodeObject, this.showSettings, this.aliasName), this.equipNumManage = new B(this.groupNodeObject, this.aliasName), this.requestManage = new D(this.nodesMap, this.equipControllObject);
   },
   mounted() {
     this.updateCheckedStatusWithControls(), this.updateCheckedStatusWithEquips(), window.addEventListener("message", (s) => {
@@ -991,16 +1044,16 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
     // 初始化
     init() {
       this.data[0].expand = !0, this.updateTreeList(), setTimeout(() => {
-        Object.values(this.groupNodeObject).forEach((s) => {
+        Object.values(this.groupNodeObject).forEach((s, t) => {
           !s.expand && this.expandGroup.includes(s.key) && (s.expand = !0), this.filterWithAlias(s.key), this.updateGroupEquips(s.key, !0);
-        }), this.equipNumManage.resetGroupNum(this.isSearchStatus), this.showStatus && !this.equipStatusManage && (this.equipStatusManage = new A(this.nodesMap, this.equipStatusObject, this.groupNodeObject, this.statusChange, this.aliasName));
-      }, 100);
+        }), this.showCheckbox && this.checkStatusManage && this.checkStatusManage.updateGroupCheckStatus(), this.showStatus && !this.equipStatusManage && (this.equipStatusManage = new U(this.nodesMap, this.equipStatusObject, this.groupNodeObject, this.statusChange, this.aliasName));
+      }, 500);
     },
     // 根据条件过滤
     filterWithAlias(s) {
       if (this.aliasName) {
-        let e = this.window[`group-${s}`] || [];
-        this.window[`group-${s}${this.aliasName}`] = this.filterData(e);
+        let t = this.window[`group-${s}`] || [];
+        this.window[`group-${s}${this.aliasName}`] = this.filterData(t);
       }
     },
     // 更新当前选中
@@ -1008,53 +1061,49 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       this.window.equipCache && this.window.equipCache[this.currentNodeKey] && (this.currentSelect = `${this.window.equipCache[this.currentNodeKey].groupId}-${this.currentNodeKey}`);
     },
     // 设备状态变化
-    statusChange(s, e, t) {
-      this.currentSelect == `${s}-${e}` && this.$emit("statusChange", e, t);
+    statusChange(s, t, e) {
+      this.currentSelect == `${s}-${t}` && this.$emit("statusChange", t, e);
     },
     // 更新checkbox选中状态
     updateCheckWidthJob() {
-      this.showCheckbox && (this.checkStatusManage.resetCheckedStatus(), this.updateCheckedStatusWithControls(), this.updateCheckedStatusWithEquips());
+      this.showCheckbox && (this.checkStatusManage.resetCheckedStatus(), this.updateCheckedStatusWithControls(), this.updateCheckedStatusWithEquips(), this.checkStatusManage && this.checkStatusManage.updateGroupCheckStatus());
     },
     // 通过外框更新设备
-    updateGroupEquips(s, e) {
+    updateGroupEquips(s, t) {
       if (!this.isSearchStatus && this.groupNodeObject[s]) {
-        let t = this.equipNumManage.getAllEquipsNum();
-        this.$emit("getTotal", t);
-      }
-      if (e) {
-        let t = this.window[`group-${s}${this.aliasName}`] || [];
-        this.equipNumManage.setGroupNum(s, t.length);
+        let e = this.equipNumManage.getAllEquipsNum();
+        this.$emit("getTotal", e);
       }
-      this.groupNodeObject[s].expand && this.updateList(s, this.groupNodeObject[s].level, null, !1);
+      this.equipNumManage.resetGroupNum(this.isSearchStatus, this.filterEquip, this.equipStatusObject), this.groupNodeObject[s].expand && this.updateList(s, this.groupNodeObject[s].level, null, !1);
     },
     // 展开的时候从缓存中拿设备数据到equips中并更新视图
     updateList(s) {
       if (this.groupNodeObject[s]) {
-        let e = [];
-        this.isSearchStatus ? (e = this.window[`group-${s}-search`], this.groupNodeObject[s].equips = [...d.deepClone(e, Number(this.groupNodeObject[s].level) + 1, this.showSettings, s, this.equipCheckObject, this.equipStatusObject)]) : (e = this.window[`group-${s}${this.aliasName}`], this.groupNodeObject[s].equips = [...d.deepClone(e, Number(this.groupNodeObject[s].level) + 1, this.showSettings, s, this.equipCheckObject, this.equipStatusObject)]), this.cacheManage.addNodesMap(this.groupNodeObject[s].equips), this.cacheManage.closeBrotherNode(s), this.visibleList = [], this.updateTreeList(this.data), this.showStatus && this.equipStatusManage && this.equipStatusManage.updateGroupStatus(s), this.updateCurrentSelect();
+        let t = [];
+        this.isSearchStatus ? (t = this.window[`group-${s}-search`], this.groupNodeObject[s].equips = [...f.deepClone(t, Number(this.groupNodeObject[s].level) + 1, this.showSettings, s, this.equipCheckObject, this.equipStatusObject)]) : (t = this.window[`group-${s}${this.aliasName}`], this.groupNodeObject[s].equips = [...f.deepClone(t, Number(this.groupNodeObject[s].level) + 1, this.showSettings, s, this.equipCheckObject, this.equipStatusObject)]), this.cacheManage.addNodesMap(this.groupNodeObject[s].equips), this.cacheManage.closeBrotherNode(s), this.visibleList = [], this.updateTreeList(this.data), this.showCheckbox && this.checkStatusManage && t && t.length && this.checkStatusManage.updateGroupCheckStatus(), this.showStatus && this.equipStatusManage && this.equipStatusManage.updateGroupStatus(s), this.updateCurrentSelect();
       }
     },
     // 更新整个树形结构
     updateTreeList(s) {
-      s && s.forEach((e) => {
-        this.visibleList.push(e), e.expand ? e.isEquip ? (e.children || (e.children = []), e.settings && (e.children = [...e.settings || []])) : e.children = [...e.equips || [], ...e.groups || []] : e.children = [], this.updateTreeList(e.children || []);
+      s && s.length > 0 && s.forEach((t) => {
+        this.filterEquip && t.status === 2 ? this.filterEquipList.includes(t.equipNo) || this.visibleList.push(t) : this.filterEquip || this.visibleList.push(t), t.expand ? t.isEquip ? (t.children || (t.children = []), t.settings && (t.children = [...t.settings || []])) : t.children = [...t.equips || [], ...t.groups || []] : t.children = [], this.updateTreeList(t.children || []);
       });
     },
     // 节点点击事件
-    nodeClick(s, e, t, i) {
-      this.$emit("node-click", { ...s, key: s.isEquip ? s.equipNo : s.key }), s.isGroup ? s.isEquip ? this.equipClick(s, e, i) : this.groupClick(s, e, i) : this.currentSelect = s.key;
+    nodeClick(s, t, e, i) {
+      this.$emit("node-click", { ...s, key: s.isEquip ? s.equipNo : s.key }), s.isGroup ? s.isEquip ? this.equipClick(s, t, i) : this.groupClick(s, t, i) : this.currentSelect = s.key;
     },
-    groupClick(s, e, t) {
-      s.expand ? this.updateList(s.key, s.level, e, t) : (this.cacheManage.recycleGroupCache(s.key), this.visibleList = [], this.updateTreeList(this.data));
+    groupClick(s, t, e) {
+      s.expand ? this.updateList(s.key, s.level, t, e) : (this.cacheManage.recycleGroupCache(s.key), this.visibleList = [], this.updateTreeList(this.data));
     },
-    async equipClick(s, e, t) {
-      this.showSettings && (s.expand ? (s.loading = !0, await this.requestManage.getSetting(s.key, s.title, s.level, t), this.controlObject[s.equipNo] = { groupId: s.groupId }, s.loading = !1, this.visibleList.splice(e + 1, 0, ...this.nodesMap[s.key].settings), this.cacheManage.addNodesMap(this.nodesMap[s.key].settings)) : (this.visibleList.splice(e + 1, this.nodesMap[s.key].settings.length), this.cacheManage.removeNodesMap(this.nodesMap[s.key].settings), this.nodesMap[s.key].settings = [], delete this.controlObject[s.equipNo]));
+    async equipClick(s, t, e) {
+      this.showSettings && (s.expand ? (s.loading = !0, await this.requestManage.getSetting(s.key, s.title, s.level, e), this.controlObject[`${s.groupId}-${s.equipNo}`] = { groupId: s.groupId }, s.loading = !1, this.visibleList.splice(t + 1, 0, ...this.nodesMap[s.key].settings), this.cacheManage.addNodesMap(this.nodesMap[s.key].settings)) : (this.visibleList.splice(t + 1, this.nodesMap[s.key].settings.length), this.cacheManage.removeNodesMap(this.nodesMap[s.key].settings), this.nodesMap[s.key].settings = [], delete this.controlObject[`${s.groupId}-${s.equipNo}`]));
     },
     onChecked(s) {
       this.checkStatusManage && this.checkStatusManage.onChecked(s, this.isSearchStatus), this.$emit("onCheck");
     },
-    groupEditAndNew(s, e) {
-      this.$emit("groupEditAndNew", { isGroupNew: s, node: e });
+    groupEditAndNew(s, t) {
+      this.$emit("groupEditAndNew", { isGroupNew: s, node: t });
     },
     deleteGroup(s) {
       this.$emit("deleteGroup", s);
@@ -1063,7 +1112,7 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       this.controllList && this.controllList.length && this.checkStatusManage && this.checkStatusManage && this.checkStatusManage.updateCheckedStatusWithControls(this.controllList);
     },
     updateCheckedStatusWithEquips() {
-      this.selectEquips && this.selectEquips.length && this.checkStatusManage && this.checkStatusManage && this.checkStatusManage.updateCheckedStatusWithEquips(this.selectEquips);
+      this.selectEquips && (this.selectEquips.length || Object.keys(this.selectEquips).length) && this.checkStatusManage && this.checkStatusManage && this.checkStatusManage.updateCheckedStatusWithEquips(this.selectEquips);
     },
     resetCheckedStatus() {
       this.checkStatusManage && this.checkStatusManage.resetCheckedStatus();
@@ -1077,6 +1126,14 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       return this.checkStatusManage && this.checkStatusManage.getEquipSelectd();
     },
 
+    /**
+     * @description 获取选择的设备(携带分组)
+     *  @return Array
+     */
+    getEquipGroupSelectd() {
+      return this.checkStatusManage && this.checkStatusManage.getEquipGroupSelectd();
+    },
+
     /**
      * @description 获取选择的设备控制项
      *  @return Array
@@ -1116,7 +1173,7 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
     filterMethod(s) {
       this.visibleList = [], this.cacheManage.recycleAllNodeCache(), s ? (this.isSearchStatus = !0, this.searchManage.filterMethod(s)) : this.isSearchStatus = !1, this.init(), this.$nextTick(() => {
         this.$refs.virtualList.scrollToIndex(0);
-      }), this.equipNumManage.resetGroupNum(this.isSearchStatus), this.showCheckbox && (this.checkStatusManage && this.checkStatusManage.reComputedCheckNum(this.isSearchStatus), this.checkStatusManage && this.checkStatusManage.updateGroupCheckStatus());
+      }), this.equipNumManage.resetGroupNum(this.isSearchStatus, this.filterEquip, this.equipStatusObject), this.showCheckbox && (this.checkStatusManage && this.checkStatusManage.reComputedCheckNum(this.isSearchStatus), this.checkStatusManage && this.checkStatusManage.updateGroupCheckStatus());
     },
     // 重新构建树
     rebuildTree() {
@@ -1146,10 +1203,10 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       *  @return 无返回值
     */
     DeleteEquip(s) {
-      const { groupId: e, equips: t } = s || {};
-      e && this.groupNodeObject[e] && (this.updateGroupEquips(s.groupId), this.equipNumManage.resetGroupNum(), this.checkStatusManage && this.checkStatusManage.resetCheckedStatus()), t.length && t.forEach((i) => {
-        let o = this.nodesMap[`${e}-${i.id}`];
-        o && (this.currentSelect.toString().includes(i.id) && this.$emit("currentDelete"), this.showStatus && (o.status == 2 || o.status == 0 ? this.equipStatusManage.setGroupStatus(e, !1, 2) : o.status == 6 && this.equipStatusManage.setGroupStatus(e, !1, 6)), delete this.nodesMap[`${e}-${i.id}`], delete this.equipCheckObject[i.id]), delete this.equipStatusObject[i.id];
+      const { groupId: t, equips: e } = s || {};
+      t && this.groupNodeObject[t] && (this.updateGroupEquips(s.groupId), this.equipNumManage.resetGroupNum(), this.checkStatusManage && this.checkStatusManage.resetCheckedStatus()), e.length && e.forEach((i) => {
+        let o = this.nodesMap[`${t}-${i.id}`];
+        o && (this.currentSelect.toString().includes(i.id) && this.$emit("currentDelete"), this.showStatus && (o.status == 2 ? this.equipStatusManage.setGroupStatus(t, !1, 2) : o.status == 6 && this.equipStatusManage.setGroupStatus(t, !1, 6)), delete this.nodesMap[`${t}-${i.id}`], delete this.equipCheckObject[i.id]), delete this.equipStatusObject[i.id];
       });
     },
 
@@ -1159,10 +1216,10 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
       *  @return 无返回值
     */
     moveEquips(s) {
-      const { updateGroups: e, buildTree: t } = s || {};
-      !t && e ? e.forEach((i) => {
+      const { updateGroups: t, buildTree: e } = s || {};
+      !e && t ? t.forEach((i) => {
         i && this.groupNodeObject[i] && (this.updateGroupEquips(i), this.equipNumManage.resetGroupNum(), this.checkStatusManage && this.checkStatusManage.resetCheckedStatus());
-      }) : t && this.rebuildTree();
+      }) : e && this.rebuildTree();
     },
 
     /**
@@ -1171,8 +1228,8 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
        * @return 无返回值
     */
     DeleteEquipGroup(s) {
-      s.forEach((e) => {
-        e.groupId && this.nodesMap[e.groupId] && (this.isSearchStatus || this.rebuildTree());
+      s.forEach((t) => {
+        t.groupId && this.nodesMap[t.groupId] && (this.isSearchStatus || this.rebuildTree());
       });
     },
 
@@ -1182,8 +1239,8 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
        * @return 无返回值
     */
     AddEquipGroup(s) {
-      const { parentGroupId: e, groupId: t } = s || {};
-      t && this.nodesMap[e] && this.treeType && (this.isSearchStatus || this.rebuildTree());
+      const { parentGroupId: t, groupId: e } = s || {};
+      e && this.nodesMap[t] && this.treeType && (this.isSearchStatus || this.rebuildTree());
     },
 
     /** 编辑分组
@@ -1192,8 +1249,8 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
        * @return 无返回值
     */
     EditEquipGroup(s) {
-      const { groupId: e, groupName: t } = s;
-      this.nodesMap[e] && (this.nodesMap[e].title = t);
+      const { groupId: t, groupName: e } = s;
+      this.nodesMap[t] && (this.nodesMap[t].title = e);
     },
 
     /**
@@ -1202,33 +1259,50 @@ const ee = /* @__PURE__ */ E(P, [["render", Z]]), te = {
      *  @return 无返回值
      */
     AddEquip(s) {
-      const { groupId: e } = s || {};
-      e && (this.isSearchStatus || this.rebuildTree());
+      this.filterEquip && (this.filterEquipList = s == null ? void 0 : s.equips.map((t) => t.id)), this.init();
     },
 
     /**
-        * @description 新增分组设备
-        * @param {data}  {分组Id,设备}
-        * @return 无返回值
+    * @description 新增分组设备
+    * @param {data}  {分组Id,设备}
+    * @return 无返回值
     */
     EditEquip(s) {
-      const { equipNo: e, groupId: t, equipName: i } = s || {};
-      this.nodesMap[`${t}-${e}`] && (this.isSearchStatus || (this.nodesMap[`${t}-${e}`].title = i));
+      const { equipNo: t, groupId: e, equipName: i } = s || {};
+      this.nodesMap[`${e}-${t}`] && (this.isSearchStatus || (this.nodesMap[`${e}-${t}`].title = i));
+    },
+
+    /**
+        * @description 重置分组数量
+        * @param {isSearchStatus}  {是否查询状态}
+        * @return 无返回值
+    */
+    childrenResetGroupNum(s) {
+      this.equipNumManage.resetGroupNum(s, this.filterEquip, this.equipStatusObject);
+    },
+
+    /**
+     * @description 获取设备状态
+     * @param {data}  {equipNo}
+     * @return arry[equipNo]
+     */
+    getEquipStatus(s) {
+      return this.equipStatusManage.equipStatusObject[s];
     }
     // 通过外框事件更新树形结构数据--end
   }
-}, ie = {
+}, ot = {
   class: "gw-tree",
   style: { height: "100%" }
-}, se = {
+}, ut = {
   class: "tree",
   style: { height: "100%" }
 };
-function oe(s, e, t, i, o, u) {
-  const a = g("virtual-list", !0);
-  return n(), l("div", ie, [
-    C("div", se, [
-      q(a, {
+function at(s, t, e, i, o, u) {
+  const a = C("virtual-list", !0);
+  return p(), d("div", ot, [
+    S("div", ut, [
+      b(a, {
         ref: "virtualList",
         class: "virtualList",
         "data-key": "key",
@@ -1238,21 +1312,24 @@ function oe(s, e, t, i, o, u) {
         "extra-props": {
           currentSelect: o.currentSelect,
           nodeClick: u.nodeClick,
-          showStatus: t.showStatus,
-          showSettings: t.showSettings,
-          showCheckbox: t.showCheckbox,
+          showStatus: e.showStatus,
+          filterEquip: e.filterEquip,
+          showSettings: e.showSettings,
+          showCheckbox: e.showCheckbox,
           onChecked: u.onChecked,
-          showOperate: t.showOperate,
+          showOperate: e.showOperate,
           groupEditAndNew: u.groupEditAndNew,
           deleteGroup: u.deleteGroup,
-          colorConfig: t.colorConfig
+          colorConfig: e.colorConfig,
+          childrenResetGroupNum: u.childrenResetGroupNum,
+          getEquipStatus: u.getEquipStatus
         }
       }, null, 8, ["data-sources", "data-component", "extra-props"])
     ])
   ]);
 }
-const ue = /* @__PURE__ */ E(te, [["render", oe]]);
-class ae {
+const rt = /* @__PURE__ */ O(st, [["render", at]]);
+class ht {
   constructor() {
     this.eGroupNotify = new $("/eGroupNotify", "", ""), this.alreadyUpdate = {}, this.notify = null, this.window = window;
     try {
@@ -1265,181 +1342,181 @@ class ae {
     this.notify && this.notify.stop();
   }
   Init() {
-    this.eGroupNotify.openConnect().then((e) => {
-      this.notify = e;
+    this.eGroupNotify.openConnect().then((t) => {
+      this.notify = t;
       try {
-        e.invoke("GetEquipGroupTree"), e.invoke("GetAllEquipGroupTree");
-      } catch (t) {
-        console.log(t);
+        t.invoke("GetEquipGroupTree"), t.invoke("GetAllEquipGroupTree");
+      } catch (e) {
+        console.log(e);
       }
-      this.subscribeTo(e, "GetEquipGroupTree"), this.subscribeTo(e, "AddEquipGroup"), this.subscribeTo(e, "EditEquipGroup"), this.subscribeTo(e, "DeleteEquipGroup");
+      this.subscribeTo(t, "GetEquipGroupTree"), this.subscribeTo(t, "AddEquipGroup"), this.subscribeTo(t, "EditEquipGroup"), this.subscribeTo(t, "DeleteEquipGroup");
       try {
-        e.invoke("GetGroupEquips");
-      } catch (t) {
-        console.log(t);
+        t.invoke("GetGroupEquips");
+      } catch (e) {
+        console.log(e);
       }
-      this.subscribeTo(e, "GetGroupEquips"), this.subscribeTo(e, "AddEquip"), this.subscribeTo(e, "DeleteEquip"), this.subscribeTo(e, "EditEquip"), this.subscribeTo(e, "moveEquips"), this.subscribeTo(e, "GetAllEquipGroupTree"), e.onclose((t) => {
+      this.subscribeTo(t, "GetGroupEquips"), this.subscribeTo(t, "AddEquip"), this.subscribeTo(t, "DeleteEquip"), this.subscribeTo(t, "EditEquip"), this.subscribeTo(t, "moveEquips"), this.subscribeTo(t, "GetAllEquipGroupTree"), t.onclose((e) => {
         try {
           this.Init();
         } catch (i) {
           console.log(i);
         }
-        console.log("重连", t);
+        console.log("重连", e);
       });
-    }).catch((e) => {
-      console.error(e);
+    }).catch((t) => {
+      console.error(t);
     });
   }
-  subscribeTo(e, t) {
-    e.off(t), e.on(t, (i) => {
-      i && i.isSuccess && (this[t] ? this[t](i.data) : this.notice({ func: t, data: i.data, key: i.groupId }));
+  subscribeTo(t, e) {
+    t.off(e), t.on(e, (i) => {
+      i && i.isSuccess && (this[e] ? this[e](i.data) : this.notice({ func: e, data: i.data, key: i.groupId }));
     });
   }
   // 获取分组---无权限管理的分组列表--空设备分组不展示
-  GetEquipGroupTree(e) {
-    this.window.groupList || (this.window.groupList = e, this.notice({ type: "GetEquipGroupTree" }));
+  GetEquipGroupTree(t) {
+    this.window.groupList || (this.window.groupList = t, this.notice({ type: "GetEquipGroupTree" }));
   }
   // 获取全量分组---设备管理使用
-  GetAllEquipGroupTree(e) {
-    this.window.groupList_manageMent || (this.window.groupList_manageMent = e, this.notice({ type: "GetEquipGroupTreeWidthTreeType" }));
+  GetAllEquipGroupTree(t) {
+    this.window.groupList_manageMent || (this.window.groupList_manageMent = t, this.notice({ type: "GetEquipGroupTreeWidthTreeType" }));
   }
   // 新增分组
-  AddEquipGroup(e) {
-    const { parentGroupId: t, groupId: i, groupName: o } = e || {};
+  AddEquipGroup(t) {
+    const { parentGroupId: e, groupId: i, groupName: o } = t || {};
     i && (this.window.groupList_manageMent || (this.window.groupList_manageMent = []), this.window.groupList_manageMent.push({
-      parentId: t,
+      parentId: e,
       id: i,
       name: o,
       equipCount: 0
-    }), this.notice({ type: "AddEquipGroup", data: e }));
+    }), this.notice({ type: "AddEquipGroup", data: t }));
   }
   // 编辑分组
-  EditEquipGroup(e) {
-    const { groupId: t, groupName: i } = e;
+  EditEquipGroup(t) {
+    const { groupId: e, groupName: i } = t;
     this.window.groupList && window.groupList.forEach((o) => {
-      o.id == t && (o.name = i);
+      o.id == e && (o.name = i);
     }), this.window.groupList_manageMent && window.groupList_manageMent.forEach((o) => {
-      o.id == t && (o.name = i);
-    }), this.notice({ type: "EditEquipGroup", data: e });
+      o.id == e && (o.name = i);
+    }), this.notice({ type: "EditEquipGroup", data: t });
   }
-  deleteChildGroup(e, t) {
+  deleteChildGroup(t, e) {
     let i = [];
-    t.forEach((o) => {
-      o.parentId == e && i.push(o.id);
+    e.forEach((o) => {
+      o.parentId == t && i.push(o.id);
     }), i.forEach((o) => {
-      let u = t.findIndex((a) => a.id == o);
-      u > -1 && t.splice(u, 1), this.deleteChildGroup(o, t);
+      let u = e.findIndex((a) => a.id == o);
+      u > -1 && e.splice(u, 1), this.deleteChildGroup(o, e);
     });
   }
   // 删除分组
-  DeleteEquipGroup(e) {
-    e.forEach((t) => {
+  DeleteEquipGroup(t) {
+    t.forEach((e) => {
       if (this.window.groupList) {
-        let i = this.window.groupList.findIndex((o) => o.id == t.groupId);
-        i > -1 && this.window.groupList.splice(i, 1), this.deleteChildGroup(t.groupId, this.window.groupList);
+        let i = this.window.groupList.findIndex((o) => o.id == e.groupId);
+        i > -1 && this.window.groupList.splice(i, 1), this.deleteChildGroup(e.groupId, this.window.groupList);
       }
       if (this.window.groupList_manageMent) {
-        let i = this.window.groupList_manageMent.findIndex((o) => o.id == t.groupId);
-        i > -1 && this.window.groupList_manageMent.splice(i, 1), this.deleteChildGroup(t.groupId, this.window.groupList_manageMent);
+        let i = this.window.groupList_manageMent.findIndex((o) => o.id == e.groupId);
+        i > -1 && this.window.groupList_manageMent.splice(i, 1), this.deleteChildGroup(e.groupId, this.window.groupList_manageMent);
       }
-    }), this.notice({ type: "DeleteEquipGroup", data: e });
+    }), this.notice({ type: "DeleteEquipGroup", data: t });
   }
   // 获取设备
-  GetGroupEquips(e) {
-    const { groupId: t, equips: i } = e || {};
-    this.alreadyUpdate[t] || (this.window.groupCache || (this.window.groupCache = {}), this.window.groupCache[t] = {}, t && i && i instanceof Array && (i.forEach((o) => {
-      o.title = o.name, o.groupId = t, o.equipNo = o.id, delete o.name, window.equipCache || (this.window.equipCache = {}), this.window.equipCache[o.id] = o, this.window.groupCache[t][o.id] = o;
-    }), this.window[`group-${t}`] = i, this.notice({ type: "GetGroupEquips", data: { groupId: t } }), this.alreadyUpdate[t] = !0));
+  GetGroupEquips(t) {
+    const { groupId: e, equips: i } = t || {};
+    this.alreadyUpdate[e] || (this.window.groupCache || (this.window.groupCache = {}), this.window.groupCache[e] = {}, e && i && i instanceof Array && (i.forEach((o) => {
+      o.title = o.name, o.groupId = e, o.equipNo = o.id, delete o.name, window.equipCache || (this.window.equipCache = {}), this.window.equipCache[o.id] = o, this.window.groupCache[e][o.id] = o;
+    }), this.window[`group-${e}`] = i, this.notice({ type: "GetGroupEquips", data: { groupId: e } }), this.alreadyUpdate[e] = !0));
   }
   // 新增设备
-  AddEquip(e) {
-    const { groupId: t, equips: i } = e || {};
-    this.window[`group-${t}`] || (this.window[`group-${t}`] = []), this.window.groupCache || (this.window.groupCache = {}), this.window.groupCache[t] || (this.window.groupCache[t] = {}), this.window.equipCache || (this.window.equipCache = {});
-    let o = this.window[`group-${t}`].length;
-    if (t && i) {
+  AddEquip(t) {
+    const { groupId: e, equips: i } = t || {};
+    this.window[`group-${e}`] || (this.window[`group-${e}`] = []), this.window.groupCache || (this.window.groupCache = {}), this.window.groupCache[e] || (this.window.groupCache[e] = {}), this.window.equipCache || (this.window.equipCache = {});
+    let o = this.window[`group-${e}`].length;
+    if (e && i) {
       if (i.forEach((u, a) => {
-        this.window[`group-${t}`].push(
+        this.window[`group-${e}`].push(
           {
             equipNo: u.id,
-            groupId: t,
+            groupId: e,
             id: u.id,
             title: u.name
           }
-        ), this.window.equipCache[u.id] = this.window[`group-${t}`][o + a], this.window.groupCache[t][u.id] = this.window[`group-${t}`][o + a];
-      }), !this.exist(t, this.window.groupList)) {
-        let u = this.findParentList(t, this.window.groupList_manageMent);
+        ), this.window.equipCache[u.id] = this.window[`group-${e}`][o + a], this.window.groupCache[e][u.id] = this.window[`group-${e}`][o + a];
+      }), !this.exist(e, this.window.groupList)) {
+        let u = this.findParentList(e, this.window.groupList_manageMent);
         this.window.groupList.push(...u);
       }
-      this.notice({ type: "AddEquip", data: e });
+      this.notice({ type: "AddEquip", data: t });
     }
   }
-  moveEquips(e) {
-    let t = [], i = !0, o = [];
-    const { sourceGroup: u, targetGroupId: a } = e || {};
-    a && t.push(a), u.forEach((r) => {
-      if (t.push(r.groupId), (!this.window[`group-${a}`] || !this.window[`group-${a}`].length) && (this.window[`group-${a}`] = [], o.push(a)), this.window.groupCache || (this.window.groupCache = {}), this.window.groupCache[a] || (this.window.groupCache[a] = {}), r.equips.forEach((h) => {
-        if (h.title = h.name, h.groupId = a, h.equipNo = h.id, this.window[`group-${r.groupId}`]) {
-          let c = this.window[`group-${r.groupId}`].findIndex((p) => p.id == h.id);
-          c > -1 && this.window[`group-${r.groupId}`].splice(c, 1);
+  moveEquips(t) {
+    let e = [], i = !0, o = [];
+    const { sourceGroup: u, targetGroupId: a } = t || {};
+    a && e.push(a), u.forEach((h) => {
+      if (e.push(h.groupId), (!this.window[`group-${a}`] || !this.window[`group-${a}`].length) && (this.window[`group-${a}`] = [], o.push(a)), this.window.groupCache || (this.window.groupCache = {}), this.window.groupCache[a] || (this.window.groupCache[a] = {}), h.equips.forEach((r) => {
+        if (r.title = r.name, r.groupId = a, r.equipNo = r.id, this.window[`group-${h.groupId}`]) {
+          let n = this.window[`group-${h.groupId}`].findIndex((c) => c.id == r.id);
+          n > -1 && this.window[`group-${h.groupId}`].splice(n, 1);
         }
-        window.equipCache || (this.window.equipCache = {}), this.window.equipCache[h.id] = h, this.window.groupCache[a][h.id] = h, this.window[`group-${a}`].push(h);
-      }), !this.window[`group-${r.groupId}`].length) {
-        let h = this.window.groupList.findIndex((c) => c.id == r.groupId);
-        h > -1 && this.window.groupList.splice(h, 1), this.deleteChildGroup(r.groupId, this.window.groupList);
+        window.equipCache || (this.window.equipCache = {}), this.window.equipCache[r.id] = r, this.window.groupCache[a][r.id] = r, this.window[`group-${a}`].push(r);
+      }), !this.window[`group-${h.groupId}`].length) {
+        let r = this.window.groupList.findIndex((n) => n.id == h.groupId);
+        r > -1 && this.window.groupList.splice(r, 1), this.deleteChildGroup(h.groupId, this.window.groupList);
       }
-    }), o.forEach((r) => {
-      if (!this.exist(r, this.window.groupList)) {
-        let h = this.findParentList(r, this.window.groupList_manageMent);
-        this.window.groupList.push(...h);
+    }), o.forEach((h) => {
+      if (!this.exist(h, this.window.groupList)) {
+        let r = this.findParentList(h, this.window.groupList_manageMent);
+        this.window.groupList.push(...r);
       }
-    }), this.notice({ type: "moveEquips", data: { updateGroups: t, buildTree: i } });
+    }), this.notice({ type: "moveEquips", data: { updateGroups: e, buildTree: i } });
   }
-  exist(e, t) {
-    return t ? t.some((i) => i.id == e) : !1;
+  exist(t, e) {
+    return e ? e.some((i) => i.id == t) : !1;
   }
-  findParentList(e, t) {
+  findParentList(t, e) {
     let i = [];
-    if (t) {
-      let o = t.findIndex((u) => u.id == e);
-      o > -1 && i.push({ ...t[o] }), t[o].parentId && !this.exist(t[o].parentId, this.window.groupList) && i.push(...this.findParentList(t[o].parentId, this.window.groupList_manageMent));
+    if (e) {
+      let o = e.findIndex((u) => u.id == t);
+      o > -1 && i.push({ ...e[o] }), e[o].parentId && !this.exist(e[o].parentId, this.window.groupList) && i.push(...this.findParentList(e[o].parentId, this.window.groupList_manageMent));
     }
     return i;
   }
   // 删除设备
-  DeleteEquip(e) {
-    const { groupId: t, equips: i } = e || {};
-    if (t && i && i instanceof Array) {
-      if (this.window[`group-${t}`]) {
+  DeleteEquip(t) {
+    const { groupId: e, equips: i } = t || {};
+    if (e && i && i instanceof Array) {
+      if (this.window[`group-${e}`]) {
  for (let o = 0, u = i.length; o < u; o++) {
-          let a = this.window[`group-${t}`].findIndex((r) => r.id == i[o].id);
-          a > -1 && this.window[`group-${t}`].splice(a, 1), delete this.window.equipCache[i[o].id], delete this.window.groupCache[t][i[o].id];
+          let a = this.window[`group-${e}`].findIndex((h) => h.id == i[o].id);
+          a > -1 && this.window[`group-${e}`].splice(a, 1), delete this.window.equipCache[i[o].id], delete this.window.groupCache[e][i[o].id];
         } 
 }
-      this.notice({ type: "DeleteEquip", data: e });
+      this.notice({ type: "DeleteEquip", data: t });
     }
   }
   // 编辑设备
-  EditEquip(e) {
-    const { equipNo: t, groupId: i, equipName: o } = e || {};
-    i && t && (window[`group-${i}`] && (this.window.equipCache[t] = o), this.notice({ type: "EditEquip", data: e }));
+  EditEquip(t) {
+    const { equipNo: e, groupId: i, equipName: o } = t || {};
+    i && e && (window[`group-${i}`] && (this.window.equipCache[e] = o), this.notice({ type: "EditEquip", data: t }));
   }
-  notice(e) {
+  notice(t) {
     if (this.window.hasIframe) {
-      let t = document.getElementsByTagName("iframe");
-      for (let i of t) { i.contentWindow.postMessage(e); }
-    } else { window.postMessage(e, "*"); }
+      let e = document.getElementsByTagName("iframe");
+      for (let i of e) { i.contentWindow.postMessage(t); }
+    } else { window.postMessage(t, "*"); }
   }
 }
-const he = {
+const nt = {
   name: "treeV2",
   components: {
-    tree: ue
+    tree: rt
   },
-  mixins: [m],
+  mixins: [x],
   data() {
     return {
       list: [],
-      refId: d.generateUUID(),
+      refId: f.generateUUID(),
       treeKey: null,
       listKey: null,
       hasBuildTree: !1
@@ -1452,7 +1529,7 @@ const he = {
     }
   },
   mounted() {
-    this.treeKey = `equipGroup${this.treeType}`, this.listKey = `groupList${this.treeType}`, this.window[this.treeKey] ? this.list = d.formateList(JSON.parse(JSON.stringify(this.window[this.treeKey]))) : this.window[this.listKey] && this.buildTree(), window.executeQueue || (window.executeQueues = {}), window.executeQueues[this.refId] = this.destroyTree, window.addEventListener("message", (s) => {
+    this.treeKey = `equipGroup${this.treeType}`, this.listKey = `groupList${this.treeType}`, this.window[this.treeKey] ? this.list = f.formateList(JSON.parse(JSON.stringify(this.window[this.treeKey]))) : this.window[this.listKey] && this.buildTree(), window.executeQueue || (window.executeQueues = {}), window.executeQueues[this.refId] = this.destroyTree, window.addEventListener("message", (s) => {
       s && s.data && s.data.type && this[s.data.type] && this[s.data.type]();
     });
     try {
@@ -1463,7 +1540,7 @@ const he = {
   },
   methods: {
     selfRequest() {
-      new ae().Init();
+      new ht().Init();
     },
     GetEquipGroupTreeWidthTreeType() {
       this.treeType && this.window[this.listKey] && this.buildTree();
@@ -1473,8 +1550,8 @@ const he = {
     },
     buildTree() {
       if (this.window[this.listKey]) {
-        let s = d.listToTreeList(JSON.parse(JSON.stringify(this.window[this.listKey])));
-        this.list = d.formateList(JSON.parse(JSON.stringify(s))), this.window[`equipGroup${this.treeType}`] = s, this.hasBuildTree = !0;
+        let s = f.listToTreeList(JSON.parse(JSON.stringify(this.window[this.listKey])));
+        this.list = f.formateList(JSON.parse(JSON.stringify(s))), this.window[`equipGroup${this.treeType}`] = s, this.hasBuildTree = !0;
       }
     },
     filterMethod(s) {
@@ -1486,6 +1563,9 @@ const he = {
     getEquipSelectd() {
       return this.$refs[this.refId].getEquipSelectd();
     },
+    getEquipGroupSelectd() {
+      return this.$refs[this.refId].getEquipGroupSelectd();
+    },
     getControlSelected() {
       return this.$refs[this.refId].getControlSelected();
     },
@@ -1494,14 +1574,14 @@ const he = {
     }
   }
 };
-function re(s, e, t, i, o, u) {
-  const a = g("tree");
-  return n(), S(a, x({
+function ct(s, t, e, i, o, u) {
+  const a = C("tree");
+  return p(), E(a, L({
     ref: o.refId,
     data: o.list
-  }, { ...s.$attrs, ...s.$props }, T(s.$listeners), { buildTree: u.buildTree }), null, 16, ["data", "buildTree"]);
+  }, { ...s.$attrs, ...s.$props }, _(s.$listeners), { buildTree: u.buildTree }), null, 16, ["data", "buildTree"]);
 }
-const j = /* @__PURE__ */ E(he, [["render", re]]);
+const j = /* @__PURE__ */ O(nt, [["render", ct]]);
 j.install = function(s) {
   s.component(j.name, j);
 };