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

fixed issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web

pull/18/head
guangyuzhang 2021-03-14 22:45:31 +08:00
parent 6130609d28
commit 218c7d2129
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,11 +379,11 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
let detailed_value = {}; let detailed_value = {};
detailed_value['id'] = timestampIndex; detailed_value['id'] = timestampIndex;
detailed_value['startdatetime'] = currentTimestamp; detailed_value['startdatetime'] = currentTimestamp;
json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => { json['reporting_period_efficiency']['values'].forEach((currentValue, parameterIndex) => {
if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) { if (json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex] != null) {
detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2); detailed_value['a' + parameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex].toFixed(2);
} else { } else {
detailed_value['a' + 2 * energyCategoryIndex] = ''; detailed_value['a' + parameterIndex] = '';
}; };
}); });

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

@ -379,11 +379,11 @@ const EquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
let detailed_value = {}; let detailed_value = {};
detailed_value['id'] = timestampIndex; detailed_value['id'] = timestampIndex;
detailed_value['startdatetime'] = currentTimestamp; detailed_value['startdatetime'] = currentTimestamp;
json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => { json['reporting_period_efficiency']['values'].forEach((currentValue, parameterIndex) => {
if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) { if (json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex] != null) {
detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2); detailed_value['a' + arameterIndex] = json['reporting_period_efficiency']['values'][parameterIndex][timestampIndex].toFixed(2);
} else { } else {
detailed_value['a' + 2 * energyCategoryIndex] = ''; detailed_value['a' + parameterIndex] = '';
}; };
}); });