comp-adv3210 1.0.36 → 1.1.1

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=30bba86f&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=009cddea&scoped=true
 
-const _withScopeId = n => ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.pushScopeId)("data-v-30bba86f"), 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-009cddea"), n = n(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.popScopeId)(), n);
 const _hoisted_1 = {
   style: {
     "display": "flex",
@@ -14094,7 +14094,7 @@ const _hoisted_58 = {
 const _hoisted_59 = /*#__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_30bba86f_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_009cddea_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_outlined = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("star-outlined");
@@ -14221,7 +14221,7 @@ function baowu_device_treevue_type_template_id_30bba86f_scoped_true_render(_ctx,
             src: _ctx.colorSvg[dataRef.status]
           }, null, 8, _hoisted_6), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)(" " + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(dataRef.name) + " " + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(dataRef.deviceNum != -1 ? "（" + dataRef.deviceNum + "）" : ""), 1)], 8, _hoisted_5))]),
           _: 2
-        }, [dataRef.deviceCode ? {
+        }, [_ctx.ifExTree && dataRef.deviceCode ? {
           name: "overlay",
           fn: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_menu, {
             onClick: ({
@@ -14232,7 +14232,7 @@ function baowu_device_treevue_type_template_id_30bba86f_scoped_true_render(_ctx,
               key: "favorite"
             }, {
               icon: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_star_outlined)]),
-              default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)(" " + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(dataRef.isFavorite === 1 ? "取消收藏" : "收藏设备"), 1)]),
+              default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)(" " + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(_ctx.favoriteList.some(item => item.deviceCode === dataRef.deviceCode) ? "取消收藏" : "收藏设备"), 1)]),
               _: 2
             }, 1024)]),
             _: 2
@@ -14273,16 +14273,20 @@ function baowu_device_treevue_type_template_id_30bba86f_scoped_true_render(_ctx,
             })]),
             _: 2
           }, 1032, ["onClick"])]),
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_list_item, null, {
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_list_item, {
+            onClick: $event => _ctx.handleSelect(null, {
+              node: item
+            })
+          }, {
             default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_8, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("img", {
               style: {
                 "margin-right": "8px",
                 "height": "12px"
               },
               src: _ctx.colorSvg[item.status || 0]
-            }, null, 8, _hoisted_9), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_10, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item.name) + "（" + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item.deviceCode) + "） ", 1)])]),
+            }, null, 8, _hoisted_9), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_10, (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item.deviceName) + "（" + (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.toDisplayString)(item.deviceCode) + "） ", 1)])]),
             _: 2
-          }, 1024)]),
+          }, 1032, ["onClick"])]),
           _: 2
         }, 1032, ["getPopupContainer"])]),
         _: 1
@@ -14562,7 +14566,7 @@ function baowu_device_treevue_type_template_id_30bba86f_scoped_true_render(_ctx,
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", {
           key: item.id,
           class: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.normalizeClass)(['mode-item', {
-            default: item.isDefault
+            default: _ctx.currentModeLabel === item.name
           }])
         }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", {
           class: "mode-info",
@@ -14615,7 +14619,7 @@ function baowu_device_treevue_type_template_id_30bba86f_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=30bba86f&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=009cddea&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/esnext.set.difference.v2.js
 var esnext_set_difference_v2 = __webpack_require__(3375);
@@ -17977,17 +17981,17 @@ async function setDefault(params = {}) {
 
 // 收藏设备
 async function addFavorite(params = {}) {
-  return api_request.post(`/deviceTree/v1/deviceFavorite/addFavorite`, params);
+  return api_request.post(`/deviceTree/v1/favorite/add`, params);
 }
 
 // 取消收藏设备
 async function deleteFavorite(params = {}) {
-  return api_request.post(`/deviceTree/v1/deviceFavorite/deleteFavorite`, params);
+  return api_request.post(`/deviceTree/v1/favorite/remove`, params);
 }
 
 // 获取收藏列表
 async function listFavorite(params = {}) {
-  return request.post(`/deviceTree/v1/deviceFavorite/listFavorite`, params);
+  return api_request.post(`/deviceTree/v1/favorite/list`, params);
 }
 ;// CONCATENATED MODULE: ./node_modules/lodash-es/_listCacheClear.js
 /**
@@ -21363,6 +21367,7 @@ dayjs_min_default().locale("zh-cn");
       await loadConfigModes();
       loadSavedConditions();
       init();
+      fetchFavoriteList();
     });
     let treeIdInterceptor = null;
     const queryParam = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.reactive)({
@@ -21922,7 +21927,7 @@ dayjs_min_default().locale("zh-cn");
         console.error("获取常用条件失败:", error);
       }
     };
-    const loadConfigModes = async () => {
+    const fetchConfigModes = async () => {
       try {
         const params = {
           configType: 2,
@@ -21935,7 +21940,6 @@ dayjs_min_default().locale("zh-cn");
           mockModes.value = await Promise.all(rawItems.map(async item => {
             const condition = item.condition ? typeof item.condition === "string" ? JSON.parse(item.condition) : item.condition : {};
             const filteredFilters = filterValidParams(condition);
-            console.log(filteredFilters);
             const desc = await mapParamsToLabels(filteredFilters);
             return {
               ...item,
@@ -21944,24 +21948,30 @@ dayjs_min_default().locale("zh-cn");
               desc: desc
             };
           }));
-          // 如果有默认模式，更新当前模式标签并应用条件
-          const defaultMode = mockModes.value.find(m => m.isDefault);
-          if (defaultMode) {
-            currentModeLabel.value = defaultMode.name;
-            // 确保应用默认模式时不会弹出 drawer 相关的消息
-            const originalDrawerType = drawerType.value;
-            drawerType.value = "mode"; // 临时设置为 mode 以匹配逻辑
-            handleItemClick({
-              ...defaultMode,
-              silent: true
-            });
-            drawerType.value = originalDrawerType;
-          }
         }
       } catch (error) {
         console.error("获取模式列表失败:", error);
       }
     };
+    const applyDefaultMode = () => {
+      // 如果有默认模式，更新当前模式标签并应用条件
+      const defaultMode = mockModes.value.find(m => m.isDefault);
+      if (defaultMode) {
+        currentModeLabel.value = defaultMode.name;
+        // 确保应用默认模式时不会弹出 drawer 相关的消息
+        const originalDrawerType = drawerType.value;
+        drawerType.value = "mode"; // 临时设置为 mode 以匹配逻辑
+        handleItemClick({
+          ...defaultMode,
+          silent: true
+        });
+        drawerType.value = originalDrawerType;
+      }
+    };
+    const loadConfigModes = async () => {
+      await fetchConfigModes();
+      applyDefaultMode();
+    };
     const filterValidParams = params => {
       const filtered = {};
       const validKeys = ["authMode", "deviceLabelList", "parentId", "deviceCodeOrName", "careService", "meteringDevice", "specialDevice", "collectStatus", "specialtyCodeList", "importanceDegreeCodeList", "ruleConfigList", "limit", "offset", "showCount", "extendedAttrInfoList", "monId"];
@@ -22055,11 +22065,22 @@ dayjs_min_default().locale("zh-cn");
     };
     const closeDrawer = () => {
       drawerVisible.value = false;
+      // 移除未保存的临时项目，并重置现有项目的编辑状态
+      mockModes.value = mockModes.value.filter(item => !String(item.id).startsWith("mode-")).map(item => ({
+        ...item,
+        isEditing: false
+      }));
+      savedConditions.value = savedConditions.value.filter(item => !String(item.id).startsWith("cond-")).map(item => ({
+        ...item,
+        isEditing: false
+      }));
     };
     const getItemDesc = item => {
       return item.desc || "无描述";
     };
     const handleSaveMode = async () => {
+      // 先移除还未保存的临时模式，避免重复
+      mockModes.value = mockModes.value.filter(item => !String(item.id).startsWith("mode-"));
       const newId = "mode-" + Date.now();
       const saveParams = {
         ...JSON.parse(JSON.stringify(queryParam)),
@@ -22080,6 +22101,8 @@ dayjs_min_default().locale("zh-cn");
       openDrawer("mode");
     };
     const handleSaveCondition = async () => {
+      // 先移除还未保存的临时条件，避免重复
+      savedConditions.value = savedConditions.value.filter(item => !String(item.id).startsWith("cond-"));
       const newId = "cond-" + Date.now();
       const saveParams = {
         ...JSON.parse(JSON.stringify(queryParam)),
@@ -22114,6 +22137,7 @@ dayjs_min_default().locale("zh-cn");
       if (isNew || item.name !== oldName) {
         try {
           const payload = {
+            treeId: props.treeId,
             name: item.name,
             configType: drawerType.value === "mode" ? 2 : 1,
             condition: item.filters
@@ -22126,7 +22150,7 @@ dayjs_min_default().locale("zh-cn");
           if (res.code === 200) {
             message.success(isNew ? "保存成功" : "重命名成功");
             if (drawerType.value === "mode") {
-              await loadConfigModes();
+              await fetchConfigModes();
             } else {
               await loadSavedConditions();
             }
@@ -22148,16 +22172,7 @@ dayjs_min_default().locale("zh-cn");
         });
         if (res.code === 200) {
           message.success(`已将 "${item.name}" 设为默认模式`);
-          // 联动 treeMode
-          if (item.name === "仅启用设备") {
-            treeMode.value = "actived";
-            collectStatus.value = "1";
-          } else if (item.name === "全部设备") {
-            treeMode.value = "all";
-            collectStatus.value = undefined;
-          }
-          // 刷新模式列表（只有模式有设置默认）
-          await loadConfigModes();
+          await fetchConfigModes();
         } else {
           message.error(res.message || "设置默认失败");
         }
@@ -22178,7 +22193,7 @@ dayjs_min_default().locale("zh-cn");
             if (res.code === 200) {
               message.success("删除成功");
               if (drawerType.value === "mode") {
-                await loadConfigModes();
+                await fetchConfigModes();
               } else {
                 await loadSavedConditions();
               }
@@ -22655,51 +22670,30 @@ dayjs_min_default().locale("zh-cn");
       半年: [dayjs_min_default()().subtract(6, "month"), dayjs_min_default()()],
       一年: [dayjs_min_default()().subtract(1, "year"), dayjs_min_default()()]
     };
-    const favoriteList = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)([{
-      name: "示例设备 1",
-      deviceCode: "DEV001",
-      status: 1,
-      isFavorite: 1
-    }, {
-      name: "示例设备 2",
-      deviceCode: "DEV002",
-      status: 0,
-      isFavorite: 1
-    }, {
-      name: "示例设备 3",
-      deviceCode: "DEV003",
-      status: 2,
-      isFavorite: 1
-    }]);
+    const userId = localStorage.getItem("loginName");
+    const favoriteList = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)([]);
     const fetchFavoriteList = async () => {
-      // 暂时不走接口，使用假数据
-      /*
-      try {
-        const res = await listFavorite();
-        if (res.code === 200) {
-          favoriteList.value = res.result || [];
-        }
-      } catch (error) {
-        console.error("获取收藏列表失败:", error);
-      }
-      */
+      const res = await listFavorite({
+        userId,
+        treeId: props.treeId
+      });
+      if (res.code === 200) {
+        favoriteList.value = res.result || [];
+      }
     };
     const toggleFavorite = async node => {
       const deviceCode = node.deviceCode;
       if (!deviceCode) return;
       try {
-        // 对于收藏列表中的项，isFavorite 可能没有直接定义在 node 上，或者它本身就是已收藏的
-        const isFavorite = node.isFavorite === undefined ? true : node.isFavorite === 1;
+        const isFavorite = favoriteList.value.some(item => item.deviceCode === deviceCode);
         const api = isFavorite ? deleteFavorite : addFavorite;
         const res = await api({
-          deviceCode
+          deviceCode,
+          userId,
+          treeId: props.treeId
         });
         if (res.code === 200) {
           message.success(`${isFavorite ? "取消收藏" : "收藏"}成功`);
-          // 如果节点上有 isFavorite 属性则更新它
-          if (node.isFavorite !== undefined) {
-            node.isFavorite = isFavorite ? 0 : 1;
-          }
           // 刷新收藏列表
           fetchFavoriteList();
         } else {
@@ -22728,7 +22722,9 @@ dayjs_min_default().locale("zh-cn");
       if (text === "关键设备") return "imp-high";
       return "";
     };
+    const ifExTree = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.computed)(() => props.treeId !== null && props.treeId !== undefined && props.treeId !== "");
     return {
+      ifExTree,
       ifTest,
       ifXj,
       treeMode,
@@ -22841,15 +22837,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=30bba86f&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=009cddea&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=30bba86f&lang=less
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=009cddea&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=30bba86f&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=009cddea&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=30bba86f&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=1&id=009cddea&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -22860,7 +22856,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_30bba86f_scoped_true_render],['__scopeId',"data-v-30bba86f"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_009cddea_scoped_true_render],['__scopeId',"data-v-009cddea"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js