comp-adv3210 1.1.11 → 1.1.13

package/comp-adv3210.common.js

@@ -13903,9 +13903,9 @@ var exportHelper = __webpack_require__(1241);
 const __exports__ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_test_buttonvue_type_script_lang_js, [['render',render]])
 
 /* harmony default export */ var baowu_test_button = (__exports__);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=f214fea8&scoped=true
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=3440af88&scoped=true
 
-const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-f214fea8"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
+const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-3440af88"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
 const _hoisted_1 = {
   style: {
     "display": "flex",
@@ -14100,7 +14100,7 @@ const _hoisted_60 = {
 const _hoisted_61 = /*#__PURE__*/_withScopeId(() => /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
   class: "drawer-footer-text"
 }, " 设备树模式为设备树加载时的固有过滤条件，在设备树加载时会固定应用默认模式的过滤条件。该过滤条件不受用户查询条件设置的影响。 ", -1));
-function baowu_device_treevue_type_template_id_f214fea8_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_3440af88_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-input");
   const _component_a_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-button");
   const _component_star_filled = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("star-filled");
@@ -14636,7 +14636,7 @@ function baowu_device_treevue_type_template_id_f214fea8_scoped_true_render(_ctx,
     _: 1
   }, 8, ["visible", "getContainer", "onOk", "onCancel"])], 512)], 2);
 }
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=f214fea8&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=3440af88&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.set.difference.v2.js
 var esnext_set_difference_v2 = __webpack_require__(3375);
@@ -16632,7 +16632,7 @@ var TransitionEvents = {
     });
   }
 };
-/* harmony default export */ var css_animation_Event = (TransitionEvents);
+/* harmony default export */ var Event = (TransitionEvents);
 ;// CONCATENATED MODULE: ./node_modules/ant-design-vue/es/_util/wave.js
 
 
@@ -16728,8 +16728,8 @@ function isNotGrey(color) {
       if (insertExtraNode) {
         node.appendChild(extraNode);
       }
-      css_animation_Event.addStartEventListener(node, onTransitionStart);
-      css_animation_Event.addEndEventListener(node, onTransitionEnd);
+      Event.addStartEventListener(node, onTransitionStart);
+      Event.addEndEventListener(node, onTransitionEnd);
     };
     var resetEffect = function resetEffect(node) {
       if (!node || node === extraNode || !(node instanceof Element)) {
@@ -16744,8 +16744,8 @@ function isNotGrey(color) {
       if (insertExtraNode && extraNode && node.contains(extraNode)) {
         node.removeChild(extraNode);
       }
-      css_animation_Event.removeStartEventListener(node, onTransitionStart);
-      css_animation_Event.removeEndEventListener(node, onTransitionEnd);
+      Event.removeStartEventListener(node, onTransitionStart);
+      Event.removeEndEventListener(node, onTransitionEnd);
     };
     var bindAnimationEvent = function bindAnimationEvent(node) {
       if (!node || !node.getAttribute || node.getAttribute('disabled') || node.className.indexOf('disabled') >= 0) {
@@ -21341,6 +21341,49 @@ dayjs_min_default().locale("zh-cn");
         });
       }
     });
+    const queryParam = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.reactive)({
+      authMode: props.authMode,
+      deviceLabel: null,
+      parentId: null,
+      specificDomainId: null,
+      deviceCodeOrName: null,
+      careService: null,
+      meteringDevice: null,
+      specialDevice: null,
+      collectStatus: null,
+      // collectStatus:
+      //   (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
+      specialtyCodeList: [],
+      importanceDegreeCodeList: [],
+      ruleConfigList: [],
+      limit: 9999,
+      offset: 0,
+      showCount: true,
+      extendedAttrInfoList: null,
+      // 可选，传设备扩展属性信息
+      monId: null // 当前模式ID
+    });
+
+    // 用于存储当前选择模式下的过滤条件（UI不回显，但接口需要带上）
+    const activeModeFilters = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)({});
+
+    /**
+     * 合并 UI 手动输入的过滤条件和模式自带的过滤条件
+     * @returns 合并后的过滤参数
+     */
+    const getMergedParams = () => {
+      // 模式自带条件作为底色，UI 手动输入条件覆盖同名属性
+      const params = {
+        ...activeModeFilters.value
+      };
+      console.log("gm", params);
+      Object.keys(queryParam).forEach(key => {
+        if (queryParam[key] !== null && queryParam[key] !== undefined && (Array.isArray(queryParam[key]) ? queryParam[key].length > 0 : true)) {
+          params[key] = queryParam[key];
+        }
+      });
+      return params;
+    };
     const init = async function () {
       const {
         result
@@ -21352,7 +21395,7 @@ dayjs_min_default().locale("zh-cn");
       // 准备参数，如果 monId 是 0 则不传
       const getBaseParams = (extra = {}) => {
         const p = {
-          ...queryParam,
+          ...getMergedParams(),
           ...extra,
           authMode: props.authMode
         };
@@ -21397,7 +21440,7 @@ dayjs_min_default().locale("zh-cn");
       }) => {
         plainOptions.value = result.map(item => ({
           label: item.name,
-          value: item.code
+          value: item.code.toString()
         }));
       });
       await getDeviceLabelListFunction();
@@ -21407,28 +21450,25 @@ dayjs_min_default().locale("zh-cn");
       fetchFavoriteList();
     });
     let treeIdInterceptor = null;
-    const queryParam = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.reactive)({
-      authMode: props.authMode,
-      deviceLabel: null,
-      parentId: null,
-      specificDomainId: null,
-      deviceCodeOrName: null,
-      careService: null,
-      meteringDevice: null,
-      specialDevice: null,
-      collectStatus: null,
-      // collectStatus:
-      //   (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
-      specialtyCodeList: [],
-      importanceDegreeCodeList: [],
-      ruleConfigList: [],
-      limit: 9999,
-      offset: 0,
-      showCount: true,
-      extendedAttrInfoList: null,
-      // 可选，传设备扩展属性信息
-      monId: null // 当前模式ID
-    });
+    const syncQueryParam = () => {
+      // 同步状态
+      queryParam.collectStatus = collectStatus.value;
+
+      // 同步扩展属性
+      if (extendedAttrInfoList.value.length > 0) {
+        queryParam.extendedAttrInfoList = extendedAttrInfoList.value.map(({
+          id,
+          valueType,
+          value
+        }) => ({
+          id,
+          valueType,
+          value
+        }));
+      } else {
+        delete queryParam.extendedAttrInfoList;
+      }
+    };
     const fetchDataContext = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.reactive)({
       tableSize: "small",
       stripe: false,
@@ -21471,9 +21511,7 @@ dayjs_min_default().locale("zh-cn");
       });
       // 去激活useFetchData中watch的回调
       queryParam.authMode = newAuthMode;
-      const params = {
-        ...queryParam
-      };
+      const params = getMergedParams();
       if (params.monId === 0 || params.monId === undefined || params.monId === null) {
         delete params.monId;
       }
@@ -21504,20 +21542,21 @@ dayjs_min_default().locale("zh-cn");
           resolve();
           return;
         }
+        const params = getMergedParams();
         getNextLevelNodesByPage({
           parentId: a.dataRef.id,
-          specificDomainId: queryParam.specificDomainId,
+          specificDomainId: params.specificDomainId,
           authMode: props.authMode,
-          deviceCodeOrName: queryParam.deviceCodeOrName,
-          careService: queryParam.careService,
-          importanceDegreeCodeList: queryParam.importanceDegreeCodeList,
-          collectStatus: queryParam.collectStatus,
-          meteringDevice: queryParam.meteringDevice,
-          specialDevice: queryParam.specialDevice,
-          specialtyCodeList: queryParam.specialtyCodeList,
-          ruleConfigList: queryParam.ruleConfigList,
-          deviceLabel: queryParam.deviceLabel,
-          extendedAttrInfoList: queryParam.extendedAttrInfoList,
+          deviceCodeOrName: params.deviceCodeOrName,
+          careService: params.careService,
+          importanceDegreeCodeList: params.importanceDegreeCodeList,
+          collectStatus: params.collectStatus,
+          meteringDevice: params.meteringDevice,
+          specialDevice: params.specialDevice,
+          specialtyCodeList: params.specialtyCodeList,
+          ruleConfigList: params.ruleConfigList,
+          deviceLabel: params.deviceLabel,
+          extendedAttrInfoList: params.extendedAttrInfoList,
           limit: 500,
           offset: 0
         }).then(({
@@ -21546,9 +21585,10 @@ dayjs_min_default().locale("zh-cn");
           });
 
           // 使用 Promise.all 等待两个请求完成
+          const pms = getMergedParams();
           Promise.all([getStateByDeviceCodeListOrDomainIdList({
             domains,
-            collectStatus: queryParam.collectStatus,
+            collectStatus: pms.collectStatus,
             authMode: props.authMode
           }).then(({
             result: domainsInfo
@@ -21559,7 +21599,7 @@ dayjs_min_default().locale("zh-cn");
             }, {});
           }), getStateByDeviceCodeListOrDomainIdList({
             deviceCode,
-            collectStatus: queryParam.collectStatus,
+            collectStatus: pms.collectStatus,
             authMode: props.authMode
           }).then(({
             result: devicesInfo
@@ -21658,24 +21698,26 @@ dayjs_min_default().locale("zh-cn");
       treeNodeList.value = [];
       treeNodeIdList.value = [];
       await recursionTree(treeData.value);
+      const params = getMergedParams();
+      console.log("fq", params);
       // 获得已显示的节点设备数量列表
       const {
         result: deviceNums
       } = await getDeviceNumberByDomainIdList({
         authMode: props.authMode,
         domainIdList: treeNodeIdList.value,
-        parentId: queryParam.parentId,
-        deviceCodeOrName: queryParam.deviceCodeOrName,
-        careService: queryParam.careService,
-        importanceDegreeCodeList: queryParam.importanceDegreeCodeList,
-        collectStatus: queryParam.collectStatus,
-        meteringDevice: queryParam.meteringDevice,
-        specialDevice: queryParam.specialDevice,
-        specialtyCodeList: queryParam.specialtyCodeList,
-        ruleConfigList: queryParam.ruleConfigList,
-        deviceLabel: queryParam.deviceLabel,
+        parentId: params.parentId,
+        deviceCodeOrName: params.deviceCodeOrName,
+        careService: params.careService,
+        importanceDegreeCodeList: params.importanceDegreeCodeList,
+        collectStatus: params.collectStatus,
+        meteringDevice: params.meteringDevice,
+        specialDevice: params.specialDevice,
+        specialtyCodeList: params.specialtyCodeList,
+        ruleConfigList: params.ruleConfigList,
+        deviceLabel: params.deviceLabel,
         // 可选，传设备标签的id
-        extendedAttrInfoList: queryParam.extendedAttrInfoList // 可选，传设备扩展属性信息
+        extendedAttrInfoList: params.extendedAttrInfoList // 可选，传设备扩展属性信息
       });
       matchDeviceNum(treeData.value, deviceNums);
     };
@@ -21724,20 +21766,21 @@ dayjs_min_default().locale("zh-cn");
         temp = queryParam.deviceCodeOrName;
         queryParam.deviceCodeOrName = undefined;
       }
+      const params = getMergedParams();
       Promise.all(domainPathArr.map(async parentId => {
         return getNextLevelNodesByPage({
           parentId: parentId,
-          specificDomainId: queryParam.specificDomainId,
+          specificDomainId: params.specificDomainId,
           authMode: props.authMode,
-          deviceCodeOrName: queryParam.deviceCodeOrName,
-          careService: queryParam.careService,
-          importanceDegreeCodeList: queryParam.importanceDegreeCodeList,
-          collectStatus: queryParam.collectStatus,
-          meteringDevice: queryParam.meteringDevice,
-          specialDevice: queryParam.specialDevice,
-          specialtyCodeList: queryParam.specialtyCodeList,
-          ruleConfigList: queryParam.ruleConfigList,
-          deviceLabelList: queryParam.deviceLabelList,
+          deviceCodeOrName: params.deviceCodeOrName,
+          careService: params.careService,
+          importanceDegreeCodeList: params.importanceDegreeCodeList,
+          collectStatus: params.collectStatus,
+          meteringDevice: params.meteringDevice,
+          specialDevice: params.specialDevice,
+          specialtyCodeList: params.specialtyCodeList,
+          ruleConfigList: params.ruleConfigList,
+          deviceLabelList: params.deviceLabelList,
           limit: 500,
           offset: 0
         }).then(async ({
@@ -21760,7 +21803,7 @@ dayjs_min_default().locale("zh-cn");
           return Promise.all([getStateByDeviceCodeListOrDomainIdList({
             domains,
             authMode: props.authMode,
-            collectStatus: queryParam.collectStatus
+            collectStatus: params.collectStatus
           }).then(({
             result: domainsInfo
           }) => {
@@ -21771,7 +21814,7 @@ dayjs_min_default().locale("zh-cn");
           }), getStateByDeviceCodeListOrDomainIdList({
             deviceCode: deviceCodes,
             authMode: props.authMode,
-            collectStatus: queryParam.collectStatus
+            collectStatus: params.collectStatus
           }).then(({
             result: devicesInfo
           }) => {
@@ -22162,13 +22205,23 @@ dayjs_min_default().locale("zh-cn");
       // 先移除还未保存的临时模式，避免重复
       mockModes.value = mockModes.value.filter(item => !String(item.id).startsWith("mode-"));
       const newId = "mode-" + Date.now();
+
+      // 同步当前UI状态到 queryParam
+      syncQueryParam();
       const saveParams = {
         ...JSON.parse(JSON.stringify(queryParam)),
         current: 1,
         pageSize: 10
       };
       const filters = filterValidParams(saveParams);
-      const desc = await mapParamsToLabels(filters);
+
+      // 获取管理域名称
+      let domainPathName = "";
+      if (filters.parentId) {
+        const opt = parentIdOptions.value.find(o => o.value === filters.parentId);
+        domainPathName = opt ? opt.label : filters.parentId;
+      }
+      const desc = await mapParamsToLabels(filters, domainPathName);
       mockModes.value.unshift({
         id: newId,
         name: "新模式",
@@ -22184,13 +22237,23 @@ dayjs_min_default().locale("zh-cn");
       // 先移除还未保存的临时条件，避免重复
       savedConditions.value = savedConditions.value.filter(item => !String(item.id).startsWith("cond-"));
       const newId = "cond-" + Date.now();
+
+      // 同步当前UI状态到 queryParam
+      syncQueryParam();
       const saveParams = {
         ...JSON.parse(JSON.stringify(queryParam)),
         current: 1,
         pageSize: 10
       };
       const filters = filterValidParams(saveParams);
-      const desc = await mapParamsToLabels(filters);
+
+      // 获取管理域名称
+      let domainPathName = "";
+      if (filters.parentId) {
+        const opt = parentIdOptions.value.find(o => o.value === filters.parentId);
+        domainPathName = opt ? opt.label : filters.parentId;
+      }
+      const desc = await mapParamsToLabels(filters, domainPathName);
       savedConditions.value.unshift({
         id: newId,
         name: "新建常用条件",
@@ -22301,78 +22364,77 @@ dayjs_min_default().locale("zh-cn");
         }
       });
     };
-    const handleItemClick = item => {
+    const handleItemClick = async item => {
       if (item.isEditing) return;
       const filters = item.filters || {};
       // console.log(filters);
       // 1. 重置当前所有条件
-      // 如果切换的是模式（drawerType === 'mode'），则以目标模式作为重置的基准
+      // 模式点击不回显，所以始终调用不带参数的重置，确保 UI 区域清空
+      handleReset();
+
+      // 查询管理域关键字生成选项，共queryParam.parentId使用
+      if (item.domainPathName) {
+        let params = {
+          keyword: item.domainPathName
+        };
+        let res = await getDomainListByKeyword(params);
+        let data = res.result || res.data;
+        if (res.code == 200) {
+          if (data.length == 0) {
+            message.warning("管理域数据查询为0!");
+          } else {
+            message.success("数据查询成功！");
+          }
+        } else {
+          message.warning(data.message);
+          return;
+        }
+        parentIdOptions.value = [];
+        data.map(res => {
+          parentIdOptions.value.push({
+            value: res.domainId,
+            label: res.domainNamePath
+          });
+        });
+      }
+      const filtersParams = JSON.parse(JSON.stringify(filters));
       if (drawerType.value === "mode") {
-        handleReset(item);
-      } else {
-        handleReset();
+        activeModeFilters.value = {
+          ...filtersParams
+        }; // 将模式条件存储到影子变量
+        console.log("mode", activeModeFilters.value);
       }
-
-      // 2. 应用保存的过滤条件
-      Object.assign(queryParam, JSON.parse(JSON.stringify(filters)));
       const params = {
-        ...queryParam
+        ...filtersParams
       };
+      // 先算出 id 应该是多少，再统一赋值
+      params.monId = drawerType.value === "mode" ? item.id : currentModeId.value;
       if (params.monId === 0 || params.monId === undefined || params.monId === null) {
         delete params.monId;
       }
+      console.log("bf", params);
       Object.assign(fetchDataContext, {
         requestParams: params,
         current: 1,
         pageSize: 10
       });
 
-      // 3. 同步管理属性 (s, c, m)
-      managementAttribute.value = [];
-      if (queryParam.specialDevice === 1 || queryParam.specialDevice === "1") managementAttribute.value.push("s");
-      if (queryParam.careService === 1 || queryParam.careService === "1") managementAttribute.value.push("c");
-      if (queryParam.meteringDevice === 1 || queryParam.meteringDevice === "1") managementAttribute.value.push("m");
-
-      // 4. 同步状态选择框
-      if (queryParam.collectStatus) {
-        collectStatus.value = queryParam.collectStatus;
-      }
-
-      // 5. 同步管理域显示 (如果 parentIdOptions 中没有该 ID，则手动添加一个项以显示 ID)
-      if (queryParam.parentId) {
-        const exists = parentIdOptions.value.some(opt => opt.value === queryParam.parentId);
-        if (!exists) {
-          parentIdOptions.value.push({
-            value: queryParam.parentId,
-            label: queryParam.parentId // 暂时显示ID，后续如果有需求可以根据ID查询名称
-          });
-        }
-      }
+      // 2. 应用保存的过滤条件,模式不回显
+      if (drawerType.value !== "mode") {
+        Object.assign(queryParam, params);
+        // 3. 同步 UI 状态
+        syncUIState();
 
-      // 6. 同步扩展属性
-      if (queryParam.extendedAttrInfoList && queryParam.extendedAttrInfoList.length) {
-        // 同步级联选择器的值
-        cascaderValue.value = queryParam.extendedAttrInfoList.map(attr => {
-          if (attr.valueType === 1) {
-            return [attr.id, attr.value];
+        // 5. 同步管理域显示 (如果 parentIdOptions 中没有该 ID，则手动添加一个项以显示 ID)
+        if (queryParam.parentId) {
+          const exists = parentIdOptions.value.some(opt => opt.value === queryParam.parentId);
+          if (!exists) {
+            parentIdOptions.value.push({
+              value: queryParam.parentId,
+              label: queryParam.parentId // 暂时显示ID，后续如果有需求可以根据ID查询名称
+            });
           }
-          return [attr.id];
-        });
-
-        // 同步输入框列表并激活显示，确保名称已映射
-        extendedAttrInfoList.value = queryParam.extendedAttrInfoList.map(attr => {
-          const attrDef = extendedAttrInfoOptions.value.find(o => o.value === attr.id);
-          return {
-            ...attr,
-            name: attrDef ? attrDef.label : attr.name || attr.id
-          };
-        });
-
-        // 根据属性类型激活对应的输入组件显示
-        inputValue.value = extendedAttrInfoList.value.some(a => a.valueType === 4);
-        dateValue.value = extendedAttrInfoList.value.some(a => a.valueType === 2);
-        timeValue.value = extendedAttrInfoList.value.some(a => a.valueType === 3);
-        enumeration.value = extendedAttrInfoList.value.some(a => a.valueType === 1);
+        }
       }
 
       // console.log(item);
@@ -22419,7 +22481,6 @@ dayjs_min_default().locale("zh-cn");
       console.log(targetOption);
       targetOption.loading = true;
       if (targetOption.valueType === 1) {
-        console.log("sss");
         let res = await getMapListByExtendedAttrId({
           id: targetOption.value
         });
@@ -22435,9 +22496,9 @@ dayjs_min_default().locale("zh-cn");
       extendedAttrInfoOptions.value = [...extendedAttrInfoOptions.value];
     };
     const handleCascaderChange = (value, selectedOptions) => {
-      console.log("Cascader Change:", value, selectedOptions);
-      if (value && value.length === 1 && value[0].length === 1) {
-        cascaderValue.value = [];
+      let targetOption = selectedOptions[selectedOptions.length - 1];
+      if (targetOption && targetOption.valueType == "1" && !targetOption.isLeaf) {
+        cascaderValue.value.pop();
         loadData(selectedOptions);
         return;
       }
@@ -22509,9 +22570,7 @@ dayjs_min_default().locale("zh-cn");
 
     const handleSearch = () => {
       emit("fix", true);
-      const params = {
-        ...queryParam
-      };
+      const params = getMergedParams();
       if (params.monId === 0 || params.monId === undefined || params.monId === null) {
         delete params.monId;
       }
@@ -22530,10 +22589,8 @@ dayjs_min_default().locale("zh-cn");
       visible.value = true;
     };
     async function handleSeniorQuery() {
-      if ("extendedAttrInfoList" in queryParam) {
-        delete queryParam.extendedAttrInfoList;
-      }
-      if (extendedAttrInfoList.value.length > 0) {
+      syncQueryParam();
+      if (queryParam.extendedAttrInfoList && queryParam.extendedAttrInfoList.length > 0) {
         // 校验是否所有选中的属性都填写了值
         const incomplete = extendedAttrInfoList.value.find(item => {
           if (Array.isArray(item.value)) return item.value.length === 0;
@@ -22543,22 +22600,8 @@ dayjs_min_default().locale("zh-cn");
           message.info(`请补充扩展属性 [${incomplete.name}] 的值！`);
           return;
         }
-
-        // 构建符合要求的列表（移除展示用的 name 字段）
-        queryParam.extendedAttrInfoList = extendedAttrInfoList.value.map(({
-          id,
-          valueType,
-          value
-        }) => ({
-          id,
-          valueType,
-          value
-        }));
       }
-      queryParam.collectStatus = collectStatus.value;
-      const params = {
-        ...queryParam
-      };
+      const params = getMergedParams();
       if (params.monId === 0 || params.monId === undefined || params.monId === null) {
         delete params.monId;
       }
@@ -22588,50 +22631,7 @@ dayjs_min_default().locale("zh-cn");
       emit("fix", false);
       visible.value = false;
     };
-    const handleReset = (targetMode = null) => {
-      // 如果第一个参数是事件对象（PointerEvent等），说明是通过点击重置按钮调用的，忽略该参数
-      const mode = targetMode && !(targetMode instanceof Event) ? targetMode : null;
-
-      // 获取当前模式的条件
-      const currentMode = mode || mockModes.value.find(m => m.id === currentModeId.value);
-      const modeFilters = currentMode && currentMode.filters ? currentMode.filters : {};
-
-      // 定义需要重置的字段及其默认值
-      const defaultState = {
-        deviceLabel: null,
-        parentId: null,
-        deviceCodeOrName: null,
-        careService: null,
-        meteringDevice: null,
-        specialDevice: null,
-        // collectStatus:
-        //   (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
-        collectStatus: null,
-        deviceTypeCodeList: [],
-        specialtyCodeList: [],
-        importanceDegreeCodeList: [],
-        ruleConfigList: [],
-        extendedAttrInfoList: null,
-        showCount: true,
-        monId: null
-      };
-
-      // 1. 重置 queryParam
-      Object.keys(defaultState).forEach(key => {
-        // 如果当前模式包含该字段且有值，则保留模式的值；否则重置为默认值
-        if (key in modeFilters && modeFilters[key] !== undefined && modeFilters[key] !== null && !(Array.isArray(modeFilters[key]) && modeFilters[key].length === 0)) {
-          queryParam[key] = modeFilters[key];
-        } else {
-          queryParam[key] = defaultState[key];
-        }
-      });
-
-      // 特殊处理 monId：如果当前有选中模式，确保 monId 被保留
-      if (currentMode && currentMode.id !== undefined && currentMode.id !== null) {
-        queryParam.monId = currentMode.id === 0 ? undefined : currentMode.id;
-      }
-
-      // 2. 同步 UI 状态
+    const syncUIState = () => {
       // 2.1 管理属性 (s, c, m)
       managementAttribute.value = [];
       if (queryParam.specialDevice === 1 || queryParam.specialDevice === "1") managementAttribute.value.push("s");else specialDevice.value = false;
@@ -22662,6 +22662,34 @@ dayjs_min_default().locale("zh-cn");
       timeValue.value = extendedAttrInfoList.value.some(a => a.valueType === 3);
       enumeration.value = extendedAttrInfoList.value.some(a => a.valueType === 1);
     };
+    const handleReset = () => {
+      // 1. 记录当前的 monId (如果 monId 为 0 则统一为 undefined)
+      const savedMonId = currentModeId.value === 0 ? undefined : currentModeId.value;
+
+      // 重置模式条件缓存
+      // activeModeFilters.value = {};
+
+      // 2. 重置 queryParam 为默认状态
+      Object.assign(queryParam, {
+        deviceLabel: null,
+        parentId: null,
+        deviceCodeOrName: null,
+        careService: null,
+        meteringDevice: null,
+        specialDevice: null,
+        collectStatus: null,
+        deviceTypeCodeList: [],
+        specialtyCodeList: [],
+        importanceDegreeCodeList: [],
+        ruleConfigList: [],
+        extendedAttrInfoList: null,
+        showCount: true,
+        monId: savedMonId // 仅保留 monId
+      });
+
+      // 3. 同步 UI 状态
+      syncUIState();
+    };
     const fieldNames = {
       key: "id"
     };
@@ -22956,15 +22984,15 @@ dayjs_min_default().locale("zh-cn");
 }));
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=script&lang=js
  
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=f214fea8&lang=less
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=3440af88&lang=less
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=f214fea8&lang=less
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=3440af88&lang=less
 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=f214fea8&lang=less&scoped=true
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=3440af88&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=f214fea8&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=3440af88&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -22975,7 +23003,7 @@ dayjs_min_default().locale("zh-cn");
 
 
 
-const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_f214fea8_scoped_true_render],['__scopeId',"data-v-f214fea8"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_3440af88_scoped_true_render],['__scopeId',"data-v-3440af88"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js