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

fixed detailed data sort issues of Batch reports in Web UI

pull/75/head
13621160019@163.com 2021-10-23 20:00:17 +08:00
parent 45bb1790de
commit e38126e8b0
6 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
View File

@ -179,7 +179,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_value['space'] = currentCombinedEquipment['space_name']; detailed_value['space'] = currentCombinedEquipment['space_name'];
detailed_value['costcenter'] = currentCombinedEquipment['cost_center_name']; detailed_value['costcenter'] = currentCombinedEquipment['cost_center_name'];
currentCombinedEquipment['values'].forEach((currentValue, energyCategoryIndex) => { currentCombinedEquipment['values'].forEach((currentValue, energyCategoryIndex) => {
detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2); detailed_value['a' + energyCategoryIndex] = currentValue
}); });
combined_equipments.push(detailed_value); combined_equipments.push(detailed_value);
}); });
@ -202,7 +202,10 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_column_list.push({ detailed_column_list.push({
dataField: 'a' + index, dataField: 'a' + index,
text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
sort: true sort: true,
formatter: function (decimalValue) {
return decimalValue.toFixed(2);
}
}) })
}); });
setDetailedDataTableColumns(detailed_column_list); setDetailedDataTableColumns(detailed_column_list);

7
web/src/components/MyEMS/Equipment/EquipmentBatch.js
View File

@ -179,7 +179,7 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_value['space'] = currentEquipment['space_name']; detailed_value['space'] = currentEquipment['space_name'];
detailed_value['costcenter'] = currentEquipment['cost_center_name']; detailed_value['costcenter'] = currentEquipment['cost_center_name'];
currentEquipment['values'].forEach((currentValue, energyCategoryIndex) => { currentEquipment['values'].forEach((currentValue, energyCategoryIndex) => {
detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2); detailed_value['a' + energyCategoryIndex] = currentValue;
}); });
equipments.push(detailed_value); equipments.push(detailed_value);
}); });
@ -202,7 +202,10 @@ const EquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_column_list.push({ detailed_column_list.push({
dataField: 'a' + index, dataField: 'a' + index,
text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
sort: true sort: true,
formatter: function (decimalValue) {
return decimalValue.toFixed(2);
}
}) })
}); });
setDetailedDataTableColumns(detailed_column_list); setDetailedDataTableColumns(detailed_column_list);

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

@ -180,7 +180,7 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_value['costcenter'] = currentMeter['cost_center_name']; detailed_value['costcenter'] = currentMeter['cost_center_name'];
currentMeter['values'].forEach((currentValue, energyCategoryIndex) => { currentMeter['values'].forEach((currentValue, energyCategoryIndex) => {
if (currentValue !== null) { if (currentValue !== null) {
detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2); detailed_value['a' + energyCategoryIndex] = currentValue;
} else { } else {
detailed_value['a' + energyCategoryIndex] = null; detailed_value['a' + energyCategoryIndex] = null;
} }
@ -207,7 +207,14 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_column_list.push({ detailed_column_list.push({
dataField: 'a' + index, dataField: 'a' + index,
text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
sort: true sort: true,
formatter: function (decimalValue) {
if (decimalValue !== null) {
return decimalValue.toFixed(2);
} else {
return null;
}
}
}) })
}); });
setDetailedDataTableColumns(detailed_column_list); setDetailedDataTableColumns(detailed_column_list);

7
web/src/components/MyEMS/Shopfloor/ShopfloorBatch.js
View File

@ -179,7 +179,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_value['space'] = currentShopfloor['space_name']; detailed_value['space'] = currentShopfloor['space_name'];
detailed_value['costcenter'] = currentShopfloor['cost_center_name']; detailed_value['costcenter'] = currentShopfloor['cost_center_name'];
currentShopfloor['values'].forEach((currentValue, energyCategoryIndex) => { currentShopfloor['values'].forEach((currentValue, energyCategoryIndex) => {
detailed_value['a' + energyCategoryIndex] = currentValue.toFixed(2); detailed_value['a' + energyCategoryIndex] = currentValue;
}); });
shopfloors.push(detailed_value); shopfloors.push(detailed_value);
}); });
@ -202,7 +202,10 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_column_list.push({ detailed_column_list.push({
dataField: 'a' + index, dataField: 'a' + index,
text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
sort: true sort: true,
formatter: function (decimalValue) {
return decimalValue.toFixed(2);
}
}) })
}); });
setDetailedDataTableColumns(detailed_column_list); setDetailedDataTableColumns(detailed_column_list);

5
web/src/components/MyEMS/Store/StoreBatch.js
View File

@ -203,11 +203,12 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
dataField: 'a' + index, dataField: 'a' + index,
text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
sort: true, sort: true,
formatter: function (currentValue) { formatter: function (decimalValue) {
return currentValue.toFixed(2); return decimalValue.toFixed(2);
} }
}) })
}); });
console.log(detailed_column_list);
setDetailedDataTableColumns(detailed_column_list); setDetailedDataTableColumns(detailed_column_list);
setExcelBytesBase64(json['excel_bytes_base64']); setExcelBytesBase64(json['excel_bytes_base64']);

14
web/src/components/MyEMS/Tenant/TenantBatch.js
View File

@ -179,10 +179,10 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_value['space'] = currentTenant['space_name']; detailed_value['space'] = currentTenant['space_name'];
detailed_value['costcenter'] = currentTenant['cost_center_name']; detailed_value['costcenter'] = currentTenant['cost_center_name'];
currentTenant['values'].forEach((currentValue, energyCategoryIndex) => { currentTenant['values'].forEach((currentValue, energyCategoryIndex) => {
detailed_value['a' + 2 * energyCategoryIndex] = currentValue.toFixed(2); detailed_value['a' + 2 * energyCategoryIndex] = currentValue;
}); });
currentTenant['maximum'].forEach((currentValue, energyCategoryIndex) => { currentTenant['maximum'].forEach((currentValue, energyCategoryIndex) => {
detailed_value['a' + (2 * energyCategoryIndex + 1)] = currentValue.toFixed(2); detailed_value['a' + (2 * energyCategoryIndex + 1)] = currentValue;
}); });
tenants.push(detailed_value); tenants.push(detailed_value);
}); });
@ -205,11 +205,17 @@ const TenantBatch = ({ setRedirect, setRedirectUrl, t }) => {
detailed_column_list.push({ detailed_column_list.push({
dataField: 'a' + 2 * index, dataField: 'a' + 2 * index,
text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')',
sort: true sort: true,
formatter: function (decimalValue) {
return decimalValue.toFixed(2);
}
},{ },{
dataField: 'a' + (2 * index + 1), dataField: 'a' + (2 * index + 1),
text: currentValue['name'] + ' ' + t('Maximum Load') + ' (' + currentValue['unit_of_measure'] + ')', text: currentValue['name'] + ' ' + t('Maximum Load') + ' (' + currentValue['unit_of_measure'] + ')',
sort: true sort: true,
formatter: function (decimalValue) {
return decimalValue.toFixed(2);
}
}) })
}); });