From a435fb50a6cf431012780d25fad195cd6b5b3ed3 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Tue, 28 Dec 2021 20:41:57 +0800
Subject: [PATCH 1/4] fixed issue 159

---
 web/src/components/MyEMS/Meter/RealtimeChart.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/src/components/MyEMS/Meter/RealtimeChart.js b/web/src/components/MyEMS/Meter/RealtimeChart.js
index c0802557..bdd26696 100644
--- a/web/src/components/MyEMS/Meter/RealtimeChart.js
+++ b/web/src/components/MyEMS/Meter/RealtimeChart.js
@@ -85,6 +85,9 @@ class RealtimeChart extends Component {
         let trendLog = json['energy_value']['values'];
         let currentEnergyValue = undefined;
         let pointList = [];
+        let length = trendLog.length  < 60 ? trendLog.length + 1 : 60;
+        let chartData = Object.assign(this.state.chartData);
+        chartData.labels = range(1, length);
         if (trendLog.length > 0) {
           currentEnergyValue = trendLog[trendLog.length - 1];
         }
@@ -99,7 +102,8 @@ class RealtimeChart extends Component {
           pointList.push(pointItem);
         });
         if (this._isMounted) {
-          this.setState({ 
+          this.setState({
+            chartData: chartData,
             trendLog: trendLog, 
             currentEnergyValue: currentEnergyValue,
             pointList: pointList,

From 84c01910e0a923c3ac6f0f011fbc30bb35b3ca55 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Tue, 28 Dec 2021 21:24:09 +0800
Subject: [PATCH 2/4] fixed issue 159

---
 web/src/components/MyEMS/Meter/RealtimeChart.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/src/components/MyEMS/Meter/RealtimeChart.js b/web/src/components/MyEMS/Meter/RealtimeChart.js
index bdd26696..a9ff7996 100644
--- a/web/src/components/MyEMS/Meter/RealtimeChart.js
+++ b/web/src/components/MyEMS/Meter/RealtimeChart.js
@@ -82,12 +82,14 @@ class RealtimeChart extends Component {
     }).then(json => {
       if (isResponseOK) {
         console.log(json);
-        let trendLog = json['energy_value']['values'];
+        let length = json['energy_value']['values'].length;
+        let trendLog = json['energy_value']['values'] > 60 ? json['energy_value']['values'].slice(length - 60, length)
+            : json['energy_value']['values'];
+        alert(trendLog);
         let currentEnergyValue = undefined;
         let pointList = [];
-        let length = trendLog.length  < 60 ? trendLog.length + 1 : 60;
         let chartData = Object.assign(this.state.chartData);
-        chartData.labels = range(1, length);
+        chartData.labels = trendLog.length  > 60 ? range(1, 61) : range(1, trendLog.length + 1);
         if (trendLog.length > 0) {
           currentEnergyValue = trendLog[trendLog.length - 1];
         }

From 16bf7df2f8d9a37afa143d88082eb6af2b06c5b7 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Wed, 29 Dec 2021 10:18:45 +0800
Subject: [PATCH 3/4] fixed issue 159

---
 web/src/components/MyEMS/Meter/RealtimeChart.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/src/components/MyEMS/Meter/RealtimeChart.js b/web/src/components/MyEMS/Meter/RealtimeChart.js
index a9ff7996..e9cc75ce 100644
--- a/web/src/components/MyEMS/Meter/RealtimeChart.js
+++ b/web/src/components/MyEMS/Meter/RealtimeChart.js
@@ -83,9 +83,8 @@ class RealtimeChart extends Component {
       if (isResponseOK) {
         console.log(json);
         let length = json['energy_value']['values'].length;
-        let trendLog = json['energy_value']['values'] > 60 ? json['energy_value']['values'].slice(length - 60, length)
+        let trendLog = length > 60 ? json['energy_value']['values'].slice(length - 60, length)
             : json['energy_value']['values'];
-        alert(trendLog);
         let currentEnergyValue = undefined;
         let pointList = [];
         let chartData = Object.assign(this.state.chartData);

From d6a7b7ad78773cb997f33c6bd63b7ffee72c1d6a Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Wed, 29 Dec 2021 11:41:22 +0800
Subject: [PATCH 4/4] updated Meter RealtimeChart in web ui

---
 web/src/components/MyEMS/Meter/RealtimeChart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/MyEMS/Meter/RealtimeChart.js b/web/src/components/MyEMS/Meter/RealtimeChart.js
index e9cc75ce..dc13aa98 100644
--- a/web/src/components/MyEMS/Meter/RealtimeChart.js
+++ b/web/src/components/MyEMS/Meter/RealtimeChart.js
@@ -44,7 +44,7 @@ class RealtimeChart extends Component {
     trendLog: [],
     currentEnergyValue: undefined,
     chartData: {
-      labels: range(1, 60),
+      labels: range(1, 61),
       datasets: [
         {
           label: '',