comp-adv3210 1.0.8 → 1.0.10

package/comp-adv3210.common.js

@@ -12768,9 +12768,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=9183a7a0&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=46d2ae06&scoped=true
 
-const _withScopeId = n => (_pushScopeId("data-v-9183a7a0"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-46d2ae06"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
   style: {
     "height": "100%"
@@ -12801,7 +12801,7 @@ const _hoisted_9 = {
   class: "ant-pro-table"
 };
 const _hoisted_10 = ["onClick"];
-function baowu_device_treevue_type_template_id_9183a7a0_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function baowu_device_treevue_type_template_id_46d2ae06_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_a_tree = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-tree");
@@ -12881,7 +12881,7 @@ function baowu_device_treevue_type_template_id_9183a7a0_scoped_true_render(_ctx,
           dataRef
         }) => [dataRef.deviceCode ? ((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("span", {
           key: 0,
-          id: 'domainName' + dataRef.name,
+          id: 'deviceCode' + dataRef.deviceCode,
           style: {
             "display": "inline-flex",
             "align-items": "center"
@@ -13251,7 +13251,7 @@ function baowu_device_treevue_type_template_id_9183a7a0_scoped_true_render(_ctx,
     _: 1
   }, 8, ["visible", "getContainer", "onOk"])], 512)]);
 }
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=9183a7a0&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=46d2ae06&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/api/device-tree.js
 
@@ -15738,7 +15738,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
 
 // import { useDeviceTree } from "@/utils/hooks/useDeviceTree";
 
-// import request from "../api/request.js";
+
 
 
 // import { useTreeNodeStore } from "@/store/deviceTree";
@@ -15752,13 +15752,16 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
     hasSeniorSearch: {
       type: Boolean,
       default: true
-    }
+    },
+    projectPath: String
   },
   setup(props, {
     emit
   }) {
-    // eslint-disable-next-line vue/no-setup-props-destructure
-    // request.defaults.baseURL = props.projectPath;
+    // console.log(props.projectPath);
+    if (props.projectPath) {
+      api_request.defaults.baseURL = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.unref)(props.projectPath) + "/iehm-cloud/api/v1/device-tree";
+    }
     const treeRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(null);
     const tabsRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(null);
     const expandedKeys = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)([]);
@@ -15987,7 +15990,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
         temp = queryParam.deviceCodeOrName;
         queryParam.deviceCodeOrName = undefined;
       }
-      Promise.all(domainPathArr.map(parentId => {
+      Promise.all(domainPathArr.map(async parentId => {
         return getNextLevelNodesByPage({
           parentId: parentId,
           deviceCodeOrName: queryParam.deviceCodeOrName,
@@ -15999,43 +16002,85 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
           ruleConfigList: queryParam.ruleConfigList,
           limit: 500,
           offset: 0
+        }).then(async ({
+          result
+        }) => {
+          const domains = [];
+          const deviceCodes = [];
+          result.data.forEach(element => {
+            element.isLeaf = !!element.deviceCode;
+            if (element.deviceCode) {
+              deviceCodes.push(element.deviceCode);
+            } else {
+              domains.push(element.id);
+            }
+          });
+          // 并行请求状态信息
+          return Promise.all([getStateByDeviceCodeListOrDomainIdList({
+            domains
+          }).then(({
+            result: domainsInfo
+          }) => {
+            return domainsInfo.reduce((prev, cur) => {
+              prev[cur.domains] = cur.level;
+              return prev;
+            }, {});
+          }), getStateByDeviceCodeListOrDomainIdList({
+            deviceCode: deviceCodes
+          }).then(({
+            result: devicesInfo
+          }) => {
+            return devicesInfo.reduce((prev, cur) => {
+              prev[cur.deviceCode] = cur.level;
+              return prev;
+            }, {});
+          })]).then(([domainsMap, devicesMap]) => {
+            // 合并状态映射并更新节点状态
+            const statusMap = {
+              ...domainsMap,
+              ...devicesMap
+            };
+            result.data.forEach(element => {
+              element.status = element.deviceCode ? statusMap[element.deviceCode] : statusMap[element.id];
+            });
+            return result; // 返回加上status后的结果
+          });
         });
       })).then(res => {
+        // 这个res加上了status
         expandedKeys.value = [];
-        treeData.value[0].deviceNum = res[0].result.data[0].deviceNum;
+        treeData.value[0].deviceNum = res[0].data[0].deviceNum;
         visible.value = false;
+
+        // 构建树形结构
         let treeNodes = [...treeData.value];
         let treeNode = null;
         for (let i = 0; i < res.length; i++) {
           treeNode = treeNodes.find(node => node.id == domainPathArr[i]);
-          let {
-            result
-          } = res[i];
-          result.data.forEach(element => {
-            element.isLeaf = !!element.deviceCode;
-          });
-          if (treeNode != undefined) {
-            treeNode.children = result.data;
+          if (treeNode) {
+            treeNode.children = res[i].data; // 直接使用已处理的数据
             treeNodes = treeNode.children;
           }
         }
         treeData.value = [...treeData.value];
         expandedKeys.value = domainPathArr;
+
+        // 滚动到目标节点
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.nextTick)(() => {
           if (state.dataSource.length === 1) {
             queryParam.deviceCodeOrName = temp;
           }
           let deviceCode = record.deviceCode;
-          if (record.deviceCode.includes("/")) {
+          if (deviceCode.includes("/")) {
             deviceCode = deviceCode.replace(/\//g, "\\/");
           }
-          document.querySelector("#deviceCode" + deviceCode).scrollIntoView({
+          document.querySelector("#deviceCode" + deviceCode)?.scrollIntoView({
             behavior: "smooth",
             block: "center",
             inline: "start"
           });
           setTimeout(() => {
-            document.querySelector("#deviceCode" + deviceCode).click();
+            document.querySelector("#deviceCode" + deviceCode)?.click();
           });
         });
       }).catch(error => {
@@ -16397,10 +16442,10 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
 }));
 ;// 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=9183a7a0&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=0&id=46d2ae06&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=0&id=9183a7a0&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=46d2ae06&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -16410,7 +16455,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
 ;
 
 
-const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_9183a7a0_scoped_true_render],['__scopeId',"data-v-9183a7a0"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_46d2ae06_scoped_true_render],['__scopeId',"data-v-46d2ae06"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js