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

fixed forEach of undefined issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web

pull/18/head
13621160019@163.com 2021-03-13 19:16:58 +08:00
parent f870e8b483
commit 0ed2ca8fc2
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
View File

@ -374,20 +374,22 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setParameterLineChartOptions(names); setParameterLineChartOptions(names);
let detailed_value_list = []; let detailed_value_list = [];
json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => { if (json['reporting_period_efficiency']['timestamps'].length > 0) {
let detailed_value = {}; json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
detailed_value['id'] = timestampIndex; let detailed_value = {};
detailed_value['startdatetime'] = currentTimestamp; detailed_value['id'] = timestampIndex;
json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => { detailed_value['startdatetime'] = currentTimestamp;
if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) { json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => {
detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2); if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) {
} else { detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2);
detailed_value['a' + 2 * energyCategoryIndex] = ''; } else {
}; detailed_value['a' + 2 * energyCategoryIndex] = '';
};
});
detailed_value_list.push(detailed_value);
}); });
};
detailed_value_list.push(detailed_value);
});
let detailed_value = {}; let detailed_value = {};
detailed_value['id'] = detailed_value_list.length; detailed_value['id'] = detailed_value_list.length;

28
web/src/components/MyEMS/Equipment/EquipmentEfficiency.js
View File

@ -374,20 +374,22 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
setParameterLineChartOptions(names); setParameterLineChartOptions(names);
let detailed_value_list = []; let detailed_value_list = [];
json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => { if (json['reporting_period_efficiency']['timestamps'].length > 0) {
let detailed_value = {}; json['reporting_period_efficiency']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
detailed_value['id'] = timestampIndex; let detailed_value = {};
detailed_value['startdatetime'] = currentTimestamp; detailed_value['id'] = timestampIndex;
json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => { detailed_value['startdatetime'] = currentTimestamp;
if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) { json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => {
detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2); if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) {
} else { detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2);
detailed_value['a' + 2 * energyCategoryIndex] = ''; } else {
}; detailed_value['a' + 2 * energyCategoryIndex] = '';
};
});
detailed_value_list.push(detailed_value);
}); });
};
detailed_value_list.push(detailed_value);
});
let detailed_value = {}; let detailed_value = {};
detailed_value['id'] = detailed_value_list.length; detailed_value['id'] = detailed_value_list.length;