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] 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];
         }