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

Merge branch 'develop'

pull/117/head
13621160019@163.com 2021-12-29 11:43:05 +08:00
parent ce242594c2 d6a7b7ad78
commit f6317b2be3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ class RealtimeChart extends Component {
trendLog: [], trendLog: [],
currentEnergyValue: undefined, currentEnergyValue: undefined,
chartData: { chartData: {
labels: range(1, 60), labels: range(1, 61),
datasets: [ datasets: [
{ {
label: '', label: '',
@ -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];
} }
@ -99,7 +103,8 @@ class RealtimeChart extends Component {
pointList.push(pointItem); pointList.push(pointItem);
}); });
if (this._isMounted) { if (this._isMounted) {
this.setState({ this.setState({
chartData: chartData,
trendLog: trendLog, trendLog: trendLog,
currentEnergyValue: currentEnergyValue, currentEnergyValue: currentEnergyValue,
pointList: pointList, pointList: pointList,