From 0c822e6d291ba2b54d492afba9085d0b981404ec Mon Sep 17 00:00:00 2001
From: fks-yangshouda <yangshoudamhy@163.com>
Date: Tue, 3 Sep 2024 15:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/monitor/energyMonitor/page.vue   |  2 ++
 .../view/monitor/energyMonitor/tree/index.vue | 19 +++++++++++++++++++
 .../view/monitor/environmentMonitor/index.vue |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
index 99e1ba4..ae09799 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue
@@ -104,6 +104,8 @@
     } else {
       treeRef.value.getSelectAnalyse(activeKey.value);
     }
+    isGraph.value = true;
+    iconName.value = 'biaoge1';
   };
 
   function change() {
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
index 08ed6c5..9c3dd37 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -131,6 +131,8 @@
   import { device, group } from '/@/api/deviceManage';
   import { energyMonitor } from '/@/api/monitor';
   import { dict, getEnum } from '/@/api';
+  // 全局变量
+  import { items } from '/@/store/item';
 
   export default defineComponent({
     // eslint-disable-next-line vue/multi-word-component-names
@@ -139,6 +141,9 @@
       const select = ref<HTMLElement | null>(null);
       const divWidth = ref(0); // 用于存储 div 的宽度
 
+      // 全局变量
+      const state = items();
+
       // 获取 div 的宽度
       // const getDivWidth = () => {
       //   if (select.value) {
@@ -311,6 +316,8 @@
       };
 
       const getSelectGraph = (key: any) => {
+        // 开
+        state.setLoading(true);
         if (key) {
           activeKey.value = key;
           // if (
@@ -407,9 +414,15 @@
               pageData.graphTableColumns = [];
               pageData.graphGraphList = [];
             }
+          })
+          .finally(() => {
+            // 关
+            state.setLoading(false);
           });
       };
       const getSelectAnalyse = (key: any) => {
+        // 开
+        state.setLoading(true);
         if (key) {
           activeKey.value = key;
           // if (pageData.analysisGraphList.length > 0 && pageData.analysisTableList.length > 0) {
@@ -480,6 +493,12 @@
               pageData.analysisTableList = [];
               pageData.analysisGraphList = [];
             }
+          })
+          .finally(() => {
+            // 关
+            setTimeout(function () {
+              state.setLoading(false);
+            }, 2000);
           });
       };
 
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
index 8410c21..2839fd0 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/index.vue
@@ -29,7 +29,7 @@
 
     <aggregate-data ref="aggregateDataRef" v-if="activeKey == '1'" style="height: 85%" />
     <history-data ref="historyDataRef" v-if="activeKey == '2'" style="height: 90%" />
-    <average-data ref="averageDataRef" v-if="activeKey == '3'" style="height: 85%" />
+    <average-data ref="averageDataRef" v-if="activeKey == '3'" style="height: 90%" />
   </div>
 
   <a-modal