From 200af8d6dc3b19a2b15ab0a81c610ea7df9566db Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Thu, 25 May 2023 18:30:08 +0800
Subject: [PATCH] 111

---
 psdc-ui/src/views/analyse/nhfx/index.vue   | 20 +++++++++-------
 psdc-ui/src/views/bigview/index.vue        | 28 +++++++++++++++-------
 psdc-ui/src/views/control/manual/index.vue |  1 +
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/psdc-ui/src/views/analyse/nhfx/index.vue b/psdc-ui/src/views/analyse/nhfx/index.vue
index ba16586..16b0e70 100644
--- a/psdc-ui/src/views/analyse/nhfx/index.vue
+++ b/psdc-ui/src/views/analyse/nhfx/index.vue
@@ -21,10 +21,10 @@
         <div class="tableBox1">
           <el-table :data="tbfxDataTable" height="345px">
             <el-table-column label="月份" align="center" prop="month" width="100"/>
-            <el-table-column label="本期" align="center" prop="year"/>
-            <el-table-column label="同期" align="center" prop="toYear"/>
-            <el-table-column label="同比(%)" align="center" prop="compute"/>
-            <el-table-column label="累计同比(%)" align="center" prop="addUp"/>
+            <el-table-column label="本期/kWh" align="center" prop="year"/>
+            <el-table-column label="同期/kWh" align="center" prop="toYear"/>
+            <el-table-column label="同比" align="center" prop="compute"/>
+            <el-table-column label="累计同比" align="center" prop="addUp"/>
           </el-table>
         </div>
       </el-tab-pane>
@@ -45,8 +45,8 @@
             <el-table-column label="用能设备" align="center" prop="deviceName"/>
             <el-table-column :label="label1" align="center" :prop="prop1"/>
             <el-table-column :label="label2" align="center" :prop="prop2"/>
-            <el-table-column label="增加值" align="center" prop="addUp"/>
-            <el-table-column label="环比(%)" align="center" prop="compute"/>
+            <el-table-column label="增加值/kWh" align="center" prop="addUp"/>
+            <el-table-column label="环比" align="center" prop="compute"/>
             <el-table-column label="操作" align="center">
               <template v-slot="scope">
                 <el-button type="primary" size="small" :icon="Histogram" @click="handleChart(scope)">图表</el-button>
@@ -612,8 +612,12 @@ function huanbiChartFun(){
 
 /** 页面销毁时*/
 onBeforeUnmount(() => {
-  tongbiChart.dispose(); // 销毁实例，防止内存泄漏
-  huanbiChart.dispose();
+  if(tongbiChart){
+    tongbiChart.dispose(); // 销毁实例，防止内存泄漏
+  }
+  if(huanbiChart){
+    huanbiChart.dispose();
+  }
 });
 
 </script>
diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue
index a87722c..43c11b7 100644
--- a/psdc-ui/src/views/bigview/index.vue
+++ b/psdc-ui/src/views/bigview/index.vue
@@ -257,7 +257,7 @@ function dcglChartFun(){
     },
     tooltip: {
       trigger: "axis",
-      formatter: "{b0}： {c0}℃",
+      // formatter: "{b0}： {c0}℃",
       // borderColor: '#00fcff',
       borderWidth: 1
     },
@@ -350,7 +350,7 @@ function xrglChartFun(){
     },
     tooltip: {
       trigger: "axis",
-      formatter: "{b0}： {c0}℃",
+      // formatter: "{b0}： {c0}℃",
       // borderColor: '#00fcff',
       borderWidth: 1
     },
@@ -443,7 +443,7 @@ function kqyrbChartFun(){
     },
     tooltip: {
       trigger: "axis",
-      formatter: "{b0}： {c0}℃",
+      // formatter: "{b0}： {c0}℃",
       // borderColor: '#00fcff',
       borderWidth: 1
     },
@@ -536,7 +536,7 @@ function frdlChartFun(){
     },
     tooltip: {
       trigger: "axis",
-      formatter: "{b0}： {c0}℃",
+      // formatter: "{b0}： {c0}℃",
       // borderColor: '#00fcff',
       borderWidth: 1
     },
@@ -739,11 +739,21 @@ function dqglChartFun(){
 
 /** 页面销毁时*/
 onBeforeUnmount(() => {
-  dcglChart.dispose(); // 销毁实例，防止内存泄漏
-  xrglChart.dispose();
-  kqyrbChart.dispose();
-  frdlChart.dispose();
-  dqglChart.dispose();
+  if(dcglChart) {
+    dcglChart.dispose(); // 销毁实例，防止内存泄漏}
+    if (xrglChart) {
+      xrglChart.dispose();
+    }
+    if (kqyrbChart) {
+      kqyrbChart.dispose();
+    }
+    if (frdlChart) {
+      frdlChart.dispose();
+    }
+    if (dqglChart) {
+      dqglChart.dispose();
+    }
+  }
 });
 </script>
 
diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue
index 0c3bfe5..dc584a0 100644
--- a/psdc-ui/src/views/control/manual/index.vue
+++ b/psdc-ui/src/views/control/manual/index.vue
@@ -195,6 +195,7 @@ function handleDevChangeFun(id,sta){
       })
     }
   })
+  getControlLogListFun()
 }
 
 /** 设置温度*/