seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'PR' into develop

pull/106/MERGE
13621160019@163.com 2021-12-29 10:49:03 +08:00
parent a248df9006 16bf7df2f8
commit ec7fa13f3f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/components/MyEMS/Meter/RealtimeChart.js
View File

@ -82,9 +82,13 @@ class RealtimeChart extends Component {
}).then(json => { }).then(json => {
if (isResponseOK) { if (isResponseOK) {
console.log(json); console.log(json);
let trendLog = json['energy_value']['values']; let length = json['energy_value']['values'].length;
let trendLog = length > 60 ? json['energy_value']['values'].slice(length - 60, length)
: json['energy_value']['values'];
let currentEnergyValue = undefined; let currentEnergyValue = undefined;
let pointList = []; let pointList = [];
let chartData = Object.assign(this.state.chartData);
chartData.labels = trendLog.length > 60 ? range(1, 61) : range(1, trendLog.length + 1);
if (trendLog.length > 0) { if (trendLog.length > 0) {
currentEnergyValue = trendLog[trendLog.length - 1]; currentEnergyValue = trendLog[trendLog.length - 1];
} }
@ -100,6 +104,7 @@ class RealtimeChart extends Component {
}); });
if (this._isMounted) { if (this._isMounted) {
this.setState({ this.setState({
chartData: chartData,
trendLog: trendLog, trendLog: trendLog,
currentEnergyValue: currentEnergyValue, currentEnergyValue: currentEnergyValue,
pointList: pointList, pointList: pointList,