comp-adv3210 1.0.21 → 1.0.22

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=666c4436&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=57321e23&scoped=true
 
-const _withScopeId = n => (_pushScopeId("data-v-666c4436"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-57321e23"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
   style: {
     "height": "100%"
@@ -12801,7 +12801,12 @@ const _hoisted_9 = {
   class: "ant-pro-table"
 };
 const _hoisted_10 = ["onClick"];
-function baowu_device_treevue_type_template_id_666c4436_scoped_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const _hoisted_11 = {
+  style: {
+    "margin-top": "10px"
+  }
+};
+function baowu_device_treevue_type_template_id_57321e23_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");
@@ -12819,6 +12824,8 @@ function baowu_device_treevue_type_template_id_666c4436_scoped_true_render(_ctx,
   const _component_a_tooltip = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-tooltip");
   const _component_a_table = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-table");
   const _component_a_card = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-card");
+  const _component_a_radio_button = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-radio-button");
+  const _component_a_radio_group = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-radio-group");
   const _component_a_modal = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.resolveComponent)("a-modal");
   return (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.openBlock)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementBlock)("div", _hoisted_1, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_tabs, {
     ref: "tabsRef",
@@ -12922,7 +12929,7 @@ function baowu_device_treevue_type_template_id_666c4436_scoped_true_render(_ctx,
     _: 1
   }, 8, ["activeKey"]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_8, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_modal, {
     visible: _ctx.visible,
-    "onUpdate:visible": _cache[17] || (_cache[17] = $event => _ctx.visible = $event),
+    "onUpdate:visible": _cache[18] || (_cache[18] = $event => _ctx.visible = $event),
     getContainer: () => _ctx.searchModalRef,
     title: "高级搜索",
     width: "85%",
@@ -13070,12 +13077,12 @@ function baowu_device_treevue_type_template_id_666c4436_scoped_true_render(_ctx,
           md: 12,
           lg: 8
         }, {
-          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_form_item, {
+          default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_form_item, {
             label: "启用状态"
           }, {
             default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_select, {
-              value: _ctx.queryParam.collectStatus,
-              "onUpdate:value": _cache[9] || (_cache[9] = $event => _ctx.queryParam.collectStatus = $event),
+              value: _ctx.collectStatus,
+              "onUpdate:value": _cache[9] || (_cache[9] = $event => _ctx.collectStatus = $event),
               "show-arrow": "",
               "show-search": false,
               "allow-clear": "",
@@ -13095,7 +13102,7 @@ function baowu_device_treevue_type_template_id_666c4436_scoped_true_render(_ctx,
               _: 1
             }, 8, ["value", "getPopupContainer"])]),
             _: 1
-          })]),
+          }, 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.vShow, !_ctx.ifTest && !_ctx.ifXj || _ctx.ifXj && _ctx.treeMode == 'all' || _ctx.ifTest && _ctx.treeMode == 'all']])]),
           _: 1
         }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_col, {
           xs: 24,
@@ -13296,11 +13303,27 @@ function baowu_device_treevue_type_template_id_666c4436_scoped_true_render(_ctx,
         _: 1
       }, 8, ["size", "loading", "columns", "data-source", "pagination", "onChange"])]),
       _: 1
-    })])]),
+    }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withDirectives)((0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createElementVNode)("div", _hoisted_11, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)(" 设备树模式： "), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_radio_group, {
+      value: _ctx.treeMode,
+      "onUpdate:value": _cache[17] || (_cache[17] = $event => _ctx.treeMode = $event)
+    }, {
+      default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_radio_button, {
+        value: "all"
+      }, {
+        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)("全部设备")]),
+        _: 1
+      }), (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createVNode)(_component_a_radio_button, {
+        value: "actived"
+      }, {
+        default: (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.withCtx)(() => [(0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.createTextVNode)("仅启用设备")]),
+        _: 1
+      })]),
+      _: 1
+    }, 8, ["value"])], 512), [[external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.vShow, _ctx.ifTest || _ctx.ifXj]])])]),
     _: 1
   }, 8, ["visible", "getContainer", "onOk", "onCancel"])], 512)]);
 }
-;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=666c4436&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=template&id=57321e23&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/api/device-tree.js
 
@@ -15842,6 +15865,15 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
     const treeData = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)([]);
     const rootNode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)({});
     const searchModalRef = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)();
+    const testIps = ["10.26.105.178", "10.26.105.186", "10.26.8.113"];
+    const ifTest = testIps.some(ip => window.location.href.includes(ip));
+    // const ifTest = true;
+    // 判断是否为邢机环境
+    const xjIP = "10.122.2.161:8090";
+    const ifXj = window.location.href.includes(xjIP);
+    // const ifXj = true;
+    const treeMode = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(localStorage.getItem("xjTreeMode") == null || localStorage.getItem("xjTreeMode") == undefined || localStorage.getItem("xjTreeMode") == "" || !localStorage.getItem("xjTreeMode") ? "actived" : localStorage.getItem("xjTreeMode")); // all全部设备 actived仅启用设备
+    console.log(`当前环境`, ifTest, ifXj);
     const init = async function () {
       const {
         result
@@ -15852,12 +15884,14 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       const {
         result: info
       } = await deviceNumByDomainId({
-        parentId: result.id
+        parentId: result.id,
+        collectStatus: queryParam.collectStatus
       });
       const {
         result: levelMap
       } = await getStateByDeviceCodeListOrDomainIdList({
-        domains: [result.id]
+        domains: [result.id],
+        collectStatus: queryParam.collectStatus
       });
       result.deviceNum = info.deviceCount;
       result.status = levelMap[0].level;
@@ -15887,7 +15921,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       careService: null,
       meteringDevice: null,
       specialDevice: null,
-      collectStatus: "1",
+      collectStatus: (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null,
       specialtyCodeList: [],
       importanceDegreeCodeList: [],
       ruleConfigList: [],
@@ -15976,6 +16010,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
           specialDevice: queryParam.specialDevice,
           specialtyCodeList: queryParam.specialtyCodeList,
           ruleConfigList: queryParam.ruleConfigList,
+          deviceLabel: queryParam.deviceLabel,
           limit: 500,
           offset: 0
         }).then(({
@@ -15999,7 +16034,8 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
 
           // 使用 Promise.all 等待两个请求完成
           Promise.all([getStateByDeviceCodeListOrDomainIdList({
-            domains
+            domains,
+            collectStatus: queryParam.collectStatus
           }).then(({
             result: domainsInfo
           }) => {
@@ -16008,7 +16044,8 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
               return prev;
             }, {});
           }), getStateByDeviceCodeListOrDomainIdList({
-            deviceCode
+            deviceCode,
+            collectStatus: queryParam.collectStatus
           }).then(({
             result: devicesInfo
           }) => {
@@ -16155,10 +16192,12 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
           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,
           limit: 500,
           offset: 0
         }).then(async ({
@@ -16308,6 +16347,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
     const dateValue = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(false);
     const timeValue = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(false);
     const inputValue = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)(false);
+    const collectStatus = (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.ref)("1");
     async function QueryExtendedAttr() {
       let res = await getQueryExtendedAttr();
       if (res.code != 200) return message.warning("获取扩展属性失败");
@@ -16363,7 +16403,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       emit("fix", true);
       getDeviceLabelListFunction();
       QueryExtendedAttr();
-      handleSeniorQuery();
+      // handleSeniorQuery();
       visible.value = true;
     };
     async function handleSeniorQuery() {
@@ -16378,6 +16418,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
         }
         queryParam.extendedAttrInfo = extendedAttrInfo;
       }
+      queryParam.collectStatus = collectStatus.value;
       Object.assign(fetchDataContext, {
         requestParams: {
           ...queryParam
@@ -16404,7 +16445,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       queryParam.careService = null;
       queryParam.meteringDevice = null;
       queryParam.specialDevice = null;
-      queryParam.collectStatus = null;
+      queryParam.collectStatus = (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null;
       queryParam.deviceTypeCodeList = [];
       queryParam.specialtyCodeList = [];
       queryParam.importanceDegreeCodeList = [];
@@ -16413,6 +16454,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       specialDevice.value = false;
       careService.value = false;
       meteringDevice.value = false;
+      collectStatus.value = (ifTest || ifXj) && treeMode.value == "actived" ? "1" : null;
       managementAttribute.value = [];
       extendedAttrInfo.id = undefined;
       extendedAttrInfo.valueType = undefined;
@@ -16421,7 +16463,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       dateValue.value = false;
       timeValue.value = false;
       inputValue.value = false;
-      handleSeniorQuery();
+      // handleSeniorQuery();
     };
     const fieldNames = {
       key: "id"
@@ -16457,6 +16499,26 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       fetchDataContext.current = current;
       fetchDataContext.pageSize = pageSize;
     };
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_namespaceObject.watch)(() => treeMode.value, (newVal, oldVal) => {
+      if (ifXj || ifTest) {
+        console.log(oldVal, newVal);
+        localStorage.setItem("xjTreeMode", newVal);
+        if (oldVal) {
+          handleReset();
+          collectStatus.value = "1";
+          queryParam.collectStatus = newVal == "actived" ? "1" : null;
+          Object.assign(fetchDataContext, {
+            requestParams: {
+              ...queryParam
+            },
+            current: 1,
+            pageSize: 10
+          });
+        }
+      }
+    }, {
+      immediate: true
+    });
     const plainOptions = [{
       label: "电气室",
       value: "1"
@@ -16536,6 +16598,9 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       4: "data:image/svg+xml;charset=utf-8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTBweCIgaGVpZ2h0PSIxMHB4IiB2aWV3Qm94PSIwIDAgMTAgMTAiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8dGl0bGU+57yW57uEIDblpIfku70gMzwvdGl0bGU+CiAgICA8ZyBpZD0i6aG16Z2iLTEiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLkvJjljJYwMuWkh+S7vS00IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMjM2LjAwMDAwMCwgLTI3MC4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDIzNC4wMDAwMDAsIDI2OC4wMDAwMDApIj4KICAgICAgICAgICAgICAgIDxyZWN0IGlkPSLnn6nlvaIiIHg9IjAiIHk9IjAiIHdpZHRoPSIxNCIgaGVpZ2h0PSIxNCI+PC9yZWN0PgogICAgICAgICAgICAgICAgPGNpcmNsZSBpZD0i5qSt5ZyG5b2iIiBzdHJva2U9IiNGNTMyMjciIGZpbGw9IiNGNzVCNTIiIGN4PSI3IiBjeT0iNyIgcj0iNC41Ij48L2NpcmNsZT4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+"
     };
     return {
+      ifTest,
+      ifXj,
+      treeMode,
       treeData,
       columns,
       queryParam,
@@ -16570,6 +16635,7 @@ ReloadOutlined_ReloadOutlined.inheritAttrs = false;
       dateValue,
       enumeration,
       enumerationList,
+      collectStatus,
       handleIdChange,
       handleReset,
       handleSeniorQuery,
@@ -16605,10 +16671,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=666c4436&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=57321e23&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=666c4436&lang=less&scoped=true
+;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue?vue&type=style&index=0&id=57321e23&lang=less&scoped=true
 
 ;// CONCATENATED MODULE: ./src/package/baowu-device-tree/baowu-device-tree.vue
 
@@ -16618,7 +16684,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_666c4436_scoped_true_render],['__scopeId',"data-v-666c4436"]])
+const baowu_device_tree_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(baowu_device_treevue_type_script_lang_js, [['render',baowu_device_treevue_type_template_id_57321e23_scoped_true_render],['__scopeId',"data-v-57321e23"]])
 
 /* harmony default export */ var baowu_device_tree = (baowu_device_tree_exports_);
 ;// CONCATENATED MODULE: ./src/package/index.js