comp-adv3210 1.1.12 → 1.1.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13903,9 +13903,9 @@ var exportHelper = __webpack_require__(1241);
13903
13903
  const __exports__ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_test_buttonvue_type_script_lang_js, [['render',render]])
13904
13904
 
13905
13905
  /* harmony default export */ var baowu_test_button = (__exports__);
13906
- ;// 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=55738124&scoped=true
13906
+ ;// 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
13907
13907
 
13908
- const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-55738124"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
13908
+ 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);
13909
13909
  const _hoisted_1 = {
13910
13910
  style: {
13911
13911
  "display": "flex",
@@ -14100,7 +14100,7 @@ const _hoisted_60 = {
14100
14100
  const _hoisted_61 = /*#__PURE__*/_withScopeId(() => /*#__PURE__*/(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
14101
14101
  class: "drawer-footer-text"
14102
14102
  }, " 设备树模式为设备树加载时的固有过滤条件,在设备树加载时会固定应用默认模式的过滤条件。该过滤条件不受用户查询条件设置的影响。 ", -1));
14103
- function baowu_device_treevue_type_template_id_55738124_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
14103
+ function baowu_device_treevue_type_template_id_3440af88_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
14104
14104
  const _component_a_input = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-input");
14105
14105
  const _component_a_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-button");
14106
14106
  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_55738124_scoped_true_render(_ctx,
14636
14636
  _: 1
14637
14637
  }, 8, ["visible", "getContainer", "onOk", "onCancel"])], 512)], 2);
14638
14638
  }
14639
- ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=55738124&scoped=true
14639
+ ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=3440af88&scoped=true
14640
14640
 
14641
14641
  // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.set.difference.v2.js
14642
14642
  var esnext_set_difference_v2 = __webpack_require__(3375);
@@ -16632,7 +16632,7 @@ var TransitionEvents = {
16632
16632
  });
16633
16633
  }
16634
16634
  };
16635
- /* harmony default export */ var css_animation_Event = (TransitionEvents);
16635
+ /* harmony default export */ var Event = (TransitionEvents);
16636
16636
  ;// CONCATENATED MODULE: ./node_modules/ant-design-vue/es/_util/wave.js
16637
16637
 
16638
16638
 
@@ -16728,8 +16728,8 @@ function isNotGrey(color) {
16728
16728
  if (insertExtraNode) {
16729
16729
  node.appendChild(extraNode);
16730
16730
  }
16731
- css_animation_Event.addStartEventListener(node, onTransitionStart);
16732
- css_animation_Event.addEndEventListener(node, onTransitionEnd);
16731
+ Event.addStartEventListener(node, onTransitionStart);
16732
+ Event.addEndEventListener(node, onTransitionEnd);
16733
16733
  };
16734
16734
  var resetEffect = function resetEffect(node) {
16735
16735
  if (!node || node === extraNode || !(node instanceof Element)) {
@@ -16744,8 +16744,8 @@ function isNotGrey(color) {
16744
16744
  if (insertExtraNode && extraNode && node.contains(extraNode)) {
16745
16745
  node.removeChild(extraNode);
16746
16746
  }
16747
- css_animation_Event.removeStartEventListener(node, onTransitionStart);
16748
- css_animation_Event.removeEndEventListener(node, onTransitionEnd);
16747
+ Event.removeStartEventListener(node, onTransitionStart);
16748
+ Event.removeEndEventListener(node, onTransitionEnd);
16749
16749
  };
16750
16750
  var bindAnimationEvent = function bindAnimationEvent(node) {
16751
16751
  if (!node || !node.getAttribute || node.getAttribute('disabled') || node.className.indexOf('disabled') >= 0) {
@@ -21341,6 +21341,49 @@ dayjs_min_default().locale("zh-cn");
21341
21341
  });
21342
21342
  }
21343
21343
  });
21344
+ const queryParam = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.reactive)({
21345
+ authMode: props.authMode,
21346
+ deviceLabel: null,
21347
+ parentId: null,
21348
+ specificDomainId: null,
21349
+ deviceCodeOrName: null,
21350
+ careService: null,
21351
+ meteringDevice: null,
21352
+ specialDevice: null,
21353
+ collectStatus: null,
21354
+ // collectStatus:
21355
+ // (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
21356
+ specialtyCodeList: [],
21357
+ importanceDegreeCodeList: [],
21358
+ ruleConfigList: [],
21359
+ limit: 9999,
21360
+ offset: 0,
21361
+ showCount: true,
21362
+ extendedAttrInfoList: null,
21363
+ // 可选,传设备扩展属性信息
21364
+ monId: null // 当前模式ID
21365
+ });
21366
+
21367
+ // 用于存储当前选择模式下的过滤条件(UI不回显,但接口需要带上)
21368
+ const activeModeFilters = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)({});
21369
+
21370
+ /**
21371
+ * 合并 UI 手动输入的过滤条件和模式自带的过滤条件
21372
+ * @returns 合并后的过滤参数
21373
+ */
21374
+ const getMergedParams = () => {
21375
+ // 模式自带条件作为底色,UI 手动输入条件覆盖同名属性
21376
+ const params = {
21377
+ ...activeModeFilters.value
21378
+ };
21379
+ console.log("gm", params);
21380
+ Object.keys(queryParam).forEach(key => {
21381
+ if (queryParam[key] !== null && queryParam[key] !== undefined && (Array.isArray(queryParam[key]) ? queryParam[key].length > 0 : true)) {
21382
+ params[key] = queryParam[key];
21383
+ }
21384
+ });
21385
+ return params;
21386
+ };
21344
21387
  const init = async function () {
21345
21388
  const {
21346
21389
  result
@@ -21352,7 +21395,7 @@ dayjs_min_default().locale("zh-cn");
21352
21395
  // 准备参数,如果 monId 是 0 则不传
21353
21396
  const getBaseParams = (extra = {}) => {
21354
21397
  const p = {
21355
- ...queryParam,
21398
+ ...getMergedParams(),
21356
21399
  ...extra,
21357
21400
  authMode: props.authMode
21358
21401
  };
@@ -21407,28 +21450,6 @@ dayjs_min_default().locale("zh-cn");
21407
21450
  fetchFavoriteList();
21408
21451
  });
21409
21452
  let treeIdInterceptor = null;
21410
- const queryParam = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.reactive)({
21411
- authMode: props.authMode,
21412
- deviceLabel: null,
21413
- parentId: null,
21414
- specificDomainId: null,
21415
- deviceCodeOrName: null,
21416
- careService: null,
21417
- meteringDevice: null,
21418
- specialDevice: null,
21419
- collectStatus: null,
21420
- // collectStatus:
21421
- // (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
21422
- specialtyCodeList: [],
21423
- importanceDegreeCodeList: [],
21424
- ruleConfigList: [],
21425
- limit: 9999,
21426
- offset: 0,
21427
- showCount: true,
21428
- extendedAttrInfoList: null,
21429
- // 可选,传设备扩展属性信息
21430
- monId: null // 当前模式ID
21431
- });
21432
21453
  const syncQueryParam = () => {
21433
21454
  // 同步状态
21434
21455
  queryParam.collectStatus = collectStatus.value;
@@ -21490,9 +21511,7 @@ dayjs_min_default().locale("zh-cn");
21490
21511
  });
21491
21512
  // 去激活useFetchData中watch的回调
21492
21513
  queryParam.authMode = newAuthMode;
21493
- const params = {
21494
- ...queryParam
21495
- };
21514
+ const params = getMergedParams();
21496
21515
  if (params.monId === 0 || params.monId === undefined || params.monId === null) {
21497
21516
  delete params.monId;
21498
21517
  }
@@ -21523,20 +21542,21 @@ dayjs_min_default().locale("zh-cn");
21523
21542
  resolve();
21524
21543
  return;
21525
21544
  }
21545
+ const params = getMergedParams();
21526
21546
  getNextLevelNodesByPage({
21527
21547
  parentId: a.dataRef.id,
21528
- specificDomainId: queryParam.specificDomainId,
21548
+ specificDomainId: params.specificDomainId,
21529
21549
  authMode: props.authMode,
21530
- deviceCodeOrName: queryParam.deviceCodeOrName,
21531
- careService: queryParam.careService,
21532
- importanceDegreeCodeList: queryParam.importanceDegreeCodeList,
21533
- collectStatus: queryParam.collectStatus,
21534
- meteringDevice: queryParam.meteringDevice,
21535
- specialDevice: queryParam.specialDevice,
21536
- specialtyCodeList: queryParam.specialtyCodeList,
21537
- ruleConfigList: queryParam.ruleConfigList,
21538
- deviceLabel: queryParam.deviceLabel,
21539
- extendedAttrInfoList: queryParam.extendedAttrInfoList,
21550
+ deviceCodeOrName: params.deviceCodeOrName,
21551
+ careService: params.careService,
21552
+ importanceDegreeCodeList: params.importanceDegreeCodeList,
21553
+ collectStatus: params.collectStatus,
21554
+ meteringDevice: params.meteringDevice,
21555
+ specialDevice: params.specialDevice,
21556
+ specialtyCodeList: params.specialtyCodeList,
21557
+ ruleConfigList: params.ruleConfigList,
21558
+ deviceLabel: params.deviceLabel,
21559
+ extendedAttrInfoList: params.extendedAttrInfoList,
21540
21560
  limit: 500,
21541
21561
  offset: 0
21542
21562
  }).then(({
@@ -21565,9 +21585,10 @@ dayjs_min_default().locale("zh-cn");
21565
21585
  });
21566
21586
 
21567
21587
  // 使用 Promise.all 等待两个请求完成
21588
+ const pms = getMergedParams();
21568
21589
  Promise.all([getStateByDeviceCodeListOrDomainIdList({
21569
21590
  domains,
21570
- collectStatus: queryParam.collectStatus,
21591
+ collectStatus: pms.collectStatus,
21571
21592
  authMode: props.authMode
21572
21593
  }).then(({
21573
21594
  result: domainsInfo
@@ -21578,7 +21599,7 @@ dayjs_min_default().locale("zh-cn");
21578
21599
  }, {});
21579
21600
  }), getStateByDeviceCodeListOrDomainIdList({
21580
21601
  deviceCode,
21581
- collectStatus: queryParam.collectStatus,
21602
+ collectStatus: pms.collectStatus,
21582
21603
  authMode: props.authMode
21583
21604
  }).then(({
21584
21605
  result: devicesInfo
@@ -21677,24 +21698,26 @@ dayjs_min_default().locale("zh-cn");
21677
21698
  treeNodeList.value = [];
21678
21699
  treeNodeIdList.value = [];
21679
21700
  await recursionTree(treeData.value);
21701
+ const params = getMergedParams();
21702
+ console.log("fq", params);
21680
21703
  // 获得已显示的节点设备数量列表
21681
21704
  const {
21682
21705
  result: deviceNums
21683
21706
  } = await getDeviceNumberByDomainIdList({
21684
21707
  authMode: props.authMode,
21685
21708
  domainIdList: treeNodeIdList.value,
21686
- parentId: queryParam.parentId,
21687
- deviceCodeOrName: queryParam.deviceCodeOrName,
21688
- careService: queryParam.careService,
21689
- importanceDegreeCodeList: queryParam.importanceDegreeCodeList,
21690
- collectStatus: queryParam.collectStatus,
21691
- meteringDevice: queryParam.meteringDevice,
21692
- specialDevice: queryParam.specialDevice,
21693
- specialtyCodeList: queryParam.specialtyCodeList,
21694
- ruleConfigList: queryParam.ruleConfigList,
21695
- deviceLabel: queryParam.deviceLabel,
21709
+ parentId: params.parentId,
21710
+ deviceCodeOrName: params.deviceCodeOrName,
21711
+ careService: params.careService,
21712
+ importanceDegreeCodeList: params.importanceDegreeCodeList,
21713
+ collectStatus: params.collectStatus,
21714
+ meteringDevice: params.meteringDevice,
21715
+ specialDevice: params.specialDevice,
21716
+ specialtyCodeList: params.specialtyCodeList,
21717
+ ruleConfigList: params.ruleConfigList,
21718
+ deviceLabel: params.deviceLabel,
21696
21719
  // 可选,传设备标签的id
21697
- extendedAttrInfoList: queryParam.extendedAttrInfoList // 可选,传设备扩展属性信息
21720
+ extendedAttrInfoList: params.extendedAttrInfoList // 可选,传设备扩展属性信息
21698
21721
  });
21699
21722
  matchDeviceNum(treeData.value, deviceNums);
21700
21723
  };
@@ -21743,20 +21766,21 @@ dayjs_min_default().locale("zh-cn");
21743
21766
  temp = queryParam.deviceCodeOrName;
21744
21767
  queryParam.deviceCodeOrName = undefined;
21745
21768
  }
21769
+ const params = getMergedParams();
21746
21770
  Promise.all(domainPathArr.map(async parentId => {
21747
21771
  return getNextLevelNodesByPage({
21748
21772
  parentId: parentId,
21749
- specificDomainId: queryParam.specificDomainId,
21773
+ specificDomainId: params.specificDomainId,
21750
21774
  authMode: props.authMode,
21751
- deviceCodeOrName: queryParam.deviceCodeOrName,
21752
- careService: queryParam.careService,
21753
- importanceDegreeCodeList: queryParam.importanceDegreeCodeList,
21754
- collectStatus: queryParam.collectStatus,
21755
- meteringDevice: queryParam.meteringDevice,
21756
- specialDevice: queryParam.specialDevice,
21757
- specialtyCodeList: queryParam.specialtyCodeList,
21758
- ruleConfigList: queryParam.ruleConfigList,
21759
- deviceLabelList: queryParam.deviceLabelList,
21775
+ deviceCodeOrName: params.deviceCodeOrName,
21776
+ careService: params.careService,
21777
+ importanceDegreeCodeList: params.importanceDegreeCodeList,
21778
+ collectStatus: params.collectStatus,
21779
+ meteringDevice: params.meteringDevice,
21780
+ specialDevice: params.specialDevice,
21781
+ specialtyCodeList: params.specialtyCodeList,
21782
+ ruleConfigList: params.ruleConfigList,
21783
+ deviceLabelList: params.deviceLabelList,
21760
21784
  limit: 500,
21761
21785
  offset: 0
21762
21786
  }).then(async ({
@@ -21779,7 +21803,7 @@ dayjs_min_default().locale("zh-cn");
21779
21803
  return Promise.all([getStateByDeviceCodeListOrDomainIdList({
21780
21804
  domains,
21781
21805
  authMode: props.authMode,
21782
- collectStatus: queryParam.collectStatus
21806
+ collectStatus: params.collectStatus
21783
21807
  }).then(({
21784
21808
  result: domainsInfo
21785
21809
  }) => {
@@ -21790,7 +21814,7 @@ dayjs_min_default().locale("zh-cn");
21790
21814
  }), getStateByDeviceCodeListOrDomainIdList({
21791
21815
  deviceCode: deviceCodes,
21792
21816
  authMode: props.authMode,
21793
- collectStatus: queryParam.collectStatus
21817
+ collectStatus: params.collectStatus
21794
21818
  }).then(({
21795
21819
  result: devicesInfo
21796
21820
  }) => {
@@ -22341,17 +22365,12 @@ dayjs_min_default().locale("zh-cn");
22341
22365
  });
22342
22366
  };
22343
22367
  const handleItemClick = async item => {
22344
- console.log(item);
22345
22368
  if (item.isEditing) return;
22346
22369
  const filters = item.filters || {};
22347
22370
  // console.log(filters);
22348
22371
  // 1. 重置当前所有条件
22349
- // 如果切换的是模式(drawerType === 'mode'),则以目标模式作为重置的基准
22350
- if (drawerType.value === "mode") {
22351
- handleReset(item);
22352
- } else {
22353
- handleReset();
22354
- }
22372
+ // 模式点击不回显,所以始终调用不带参数的重置,确保 UI 区域清空
22373
+ handleReset();
22355
22374
 
22356
22375
  // 查询管理域关键字生成选项,共queryParam.parentId使用
22357
22376
  if (item.domainPathName) {
@@ -22378,69 +22397,44 @@ dayjs_min_default().locale("zh-cn");
22378
22397
  });
22379
22398
  });
22380
22399
  }
22381
-
22382
- // 2. 应用保存的过滤条件
22383
- Object.assign(queryParam, JSON.parse(JSON.stringify(filters)));
22384
- console.log(queryParam);
22385
- console.log(plainOptions.value);
22400
+ const filtersParams = JSON.parse(JSON.stringify(filters));
22401
+ if (drawerType.value === "mode") {
22402
+ activeModeFilters.value = {
22403
+ ...filtersParams
22404
+ }; // 将模式条件存储到影子变量
22405
+ console.log("mode", activeModeFilters.value);
22406
+ }
22386
22407
  const params = {
22387
- ...queryParam
22408
+ ...filtersParams
22388
22409
  };
22410
+ // 先算出 id 应该是多少,再统一赋值
22411
+ params.monId = drawerType.value === "mode" ? item.id : currentModeId.value;
22389
22412
  if (params.monId === 0 || params.monId === undefined || params.monId === null) {
22390
22413
  delete params.monId;
22391
22414
  }
22415
+ console.log("bf", params);
22392
22416
  Object.assign(fetchDataContext, {
22393
22417
  requestParams: params,
22394
22418
  current: 1,
22395
22419
  pageSize: 10
22396
22420
  });
22397
22421
 
22398
- // 3. 同步管理属性 (s, c, m)
22399
- managementAttribute.value = [];
22400
- if (queryParam.specialDevice === 1 || queryParam.specialDevice === "1") managementAttribute.value.push("s");
22401
- if (queryParam.careService === 1 || queryParam.careService === "1") managementAttribute.value.push("c");
22402
- if (queryParam.meteringDevice === 1 || queryParam.meteringDevice === "1") managementAttribute.value.push("m");
22403
-
22404
- // 4. 同步状态选择框
22405
- if (queryParam.collectStatus) {
22406
- collectStatus.value = queryParam.collectStatus;
22407
- }
22408
-
22409
- // 5. 同步管理域显示 (如果 parentIdOptions 中没有该 ID,则手动添加一个项以显示 ID)
22410
- if (queryParam.parentId) {
22411
- const exists = parentIdOptions.value.some(opt => opt.value === queryParam.parentId);
22412
- if (!exists) {
22413
- parentIdOptions.value.push({
22414
- value: queryParam.parentId,
22415
- label: queryParam.parentId // 暂时显示ID,后续如果有需求可以根据ID查询名称
22416
- });
22417
- }
22418
- }
22422
+ // 2. 应用保存的过滤条件,模式不回显
22423
+ if (drawerType.value !== "mode") {
22424
+ Object.assign(queryParam, params);
22425
+ // 3. 同步 UI 状态
22426
+ syncUIState();
22419
22427
 
22420
- // 6. 同步扩展属性
22421
- if (queryParam.extendedAttrInfoList && queryParam.extendedAttrInfoList.length) {
22422
- // 同步级联选择器的值
22423
- cascaderValue.value = queryParam.extendedAttrInfoList.map(attr => {
22424
- if (attr.valueType === 1) {
22425
- return [attr.id, attr.value];
22428
+ // 5. 同步管理域显示 (如果 parentIdOptions 中没有该 ID,则手动添加一个项以显示 ID)
22429
+ if (queryParam.parentId) {
22430
+ const exists = parentIdOptions.value.some(opt => opt.value === queryParam.parentId);
22431
+ if (!exists) {
22432
+ parentIdOptions.value.push({
22433
+ value: queryParam.parentId,
22434
+ label: queryParam.parentId // 暂时显示ID,后续如果有需求可以根据ID查询名称
22435
+ });
22426
22436
  }
22427
- return [attr.id];
22428
- });
22429
-
22430
- // 同步输入框列表并激活显示,确保名称已映射
22431
- extendedAttrInfoList.value = queryParam.extendedAttrInfoList.map(attr => {
22432
- const attrDef = extendedAttrInfoOptions.value.find(o => o.value === attr.id);
22433
- return {
22434
- ...attr,
22435
- name: attrDef ? attrDef.label : attr.name || attr.id
22436
- };
22437
- });
22438
-
22439
- // 根据属性类型激活对应的输入组件显示
22440
- inputValue.value = extendedAttrInfoList.value.some(a => a.valueType === 4);
22441
- dateValue.value = extendedAttrInfoList.value.some(a => a.valueType === 2);
22442
- timeValue.value = extendedAttrInfoList.value.some(a => a.valueType === 3);
22443
- enumeration.value = extendedAttrInfoList.value.some(a => a.valueType === 1);
22437
+ }
22444
22438
  }
22445
22439
 
22446
22440
  // console.log(item);
@@ -22576,9 +22570,7 @@ dayjs_min_default().locale("zh-cn");
22576
22570
 
22577
22571
  const handleSearch = () => {
22578
22572
  emit("fix", true);
22579
- const params = {
22580
- ...queryParam
22581
- };
22573
+ const params = getMergedParams();
22582
22574
  if (params.monId === 0 || params.monId === undefined || params.monId === null) {
22583
22575
  delete params.monId;
22584
22576
  }
@@ -22609,9 +22601,7 @@ dayjs_min_default().locale("zh-cn");
22609
22601
  return;
22610
22602
  }
22611
22603
  }
22612
- const params = {
22613
- ...queryParam
22614
- };
22604
+ const params = getMergedParams();
22615
22605
  if (params.monId === 0 || params.monId === undefined || params.monId === null) {
22616
22606
  delete params.monId;
22617
22607
  }
@@ -22641,50 +22631,7 @@ dayjs_min_default().locale("zh-cn");
22641
22631
  emit("fix", false);
22642
22632
  visible.value = false;
22643
22633
  };
22644
- const handleReset = (targetMode = null) => {
22645
- // 如果第一个参数是事件对象(PointerEvent等),说明是通过点击重置按钮调用的,忽略该参数
22646
- const mode = targetMode && !(targetMode instanceof Event) ? targetMode : null;
22647
-
22648
- // 获取当前模式的条件
22649
- const currentMode = mode || mockModes.value.find(m => m.id === currentModeId.value);
22650
- const modeFilters = currentMode && currentMode.filters ? currentMode.filters : {};
22651
-
22652
- // 定义需要重置的字段及其默认值
22653
- const defaultState = {
22654
- deviceLabel: null,
22655
- parentId: null,
22656
- deviceCodeOrName: null,
22657
- careService: null,
22658
- meteringDevice: null,
22659
- specialDevice: null,
22660
- // collectStatus:
22661
- // (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
22662
- collectStatus: null,
22663
- deviceTypeCodeList: [],
22664
- specialtyCodeList: [],
22665
- importanceDegreeCodeList: [],
22666
- ruleConfigList: [],
22667
- extendedAttrInfoList: null,
22668
- showCount: true,
22669
- monId: null
22670
- };
22671
-
22672
- // 1. 重置 queryParam
22673
- Object.keys(defaultState).forEach(key => {
22674
- // 如果当前模式包含该字段且有值,则保留模式的值;否则重置为默认值
22675
- if (key in modeFilters && modeFilters[key] !== undefined && modeFilters[key] !== null && !(Array.isArray(modeFilters[key]) && modeFilters[key].length === 0)) {
22676
- queryParam[key] = modeFilters[key];
22677
- } else {
22678
- queryParam[key] = defaultState[key];
22679
- }
22680
- });
22681
-
22682
- // 特殊处理 monId:如果当前有选中模式,确保 monId 被保留
22683
- if (currentMode && currentMode.id !== undefined && currentMode.id !== null) {
22684
- queryParam.monId = currentMode.id === 0 ? undefined : currentMode.id;
22685
- }
22686
-
22687
- // 2. 同步 UI 状态
22634
+ const syncUIState = () => {
22688
22635
  // 2.1 管理属性 (s, c, m)
22689
22636
  managementAttribute.value = [];
22690
22637
  if (queryParam.specialDevice === 1 || queryParam.specialDevice === "1") managementAttribute.value.push("s");else specialDevice.value = false;
@@ -22715,6 +22662,34 @@ dayjs_min_default().locale("zh-cn");
22715
22662
  timeValue.value = extendedAttrInfoList.value.some(a => a.valueType === 3);
22716
22663
  enumeration.value = extendedAttrInfoList.value.some(a => a.valueType === 1);
22717
22664
  };
22665
+ const handleReset = () => {
22666
+ // 1. 记录当前的 monId (如果 monId 为 0 则统一为 undefined)
22667
+ const savedMonId = currentModeId.value === 0 ? undefined : currentModeId.value;
22668
+
22669
+ // 重置模式条件缓存
22670
+ // activeModeFilters.value = {};
22671
+
22672
+ // 2. 重置 queryParam 为默认状态
22673
+ Object.assign(queryParam, {
22674
+ deviceLabel: null,
22675
+ parentId: null,
22676
+ deviceCodeOrName: null,
22677
+ careService: null,
22678
+ meteringDevice: null,
22679
+ specialDevice: null,
22680
+ collectStatus: null,
22681
+ deviceTypeCodeList: [],
22682
+ specialtyCodeList: [],
22683
+ importanceDegreeCodeList: [],
22684
+ ruleConfigList: [],
22685
+ extendedAttrInfoList: null,
22686
+ showCount: true,
22687
+ monId: savedMonId // 仅保留 monId
22688
+ });
22689
+
22690
+ // 3. 同步 UI 状态
22691
+ syncUIState();
22692
+ };
22718
22693
  const fieldNames = {
22719
22694
  key: "id"
22720
22695
  };
@@ -23009,15 +22984,15 @@ dayjs_min_default().locale("zh-cn");
23009
22984
  }));
23010
22985
  ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=script&lang=js
23011
22986
 
23012
- ;// 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=55738124&lang=less
22987
+ ;// 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
23013
22988
  // extracted by mini-css-extract-plugin
23014
22989
 
23015
- ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=55738124&lang=less
22990
+ ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=3440af88&lang=less
23016
22991
 
23017
- ;// 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=55738124&lang=less&scoped=true
22992
+ ;// 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
23018
22993
  // extracted by mini-css-extract-plugin
23019
22994
 
23020
- ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=55738124&lang=less&scoped=true
22995
+ ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=3440af88&lang=less&scoped=true
23021
22996
 
23022
22997
  ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
23023
22998
 
@@ -23028,7 +23003,7 @@ dayjs_min_default().locale("zh-cn");
23028
23003
 
23029
23004
 
23030
23005
 
23031
- const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_55738124_scoped_true_render],['__scopeId',"data-v-55738124"]])
23006
+ 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"]])
23032
23007
 
23033
23008
  /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
23034
23009
  ;// CONCATENATED MODULE: ./src/package/index.js