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

added AssociatedEquipmentTable to CombinedEquipmentOutput report in web UI

pull/24/head
13621160019@163.com 2021-03-23 18:09:52 +08:00
parent 78ba4d0ed1
commit 3efce5f620
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
View File

@ -33,6 +33,7 @@ import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
const AssociatedEquipmentTable = loadable(() => import('../common/AssociatedEquipmentTable'));
const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
let current_moment = moment();
@ -87,6 +88,10 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
const [detailedDataTableData, setDetailedDataTableData] = useState([]);
const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]);
const [associatedEquipmentTableData, setAssociatedEquipmentTableData] = useState([]);
const [associatedEquipmentTableColumns, setAssociatedEquipmentTableColumns] = useState([{dataField: 'name', text: t('Associated Equipment'), sort: true }]);
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
useEffect(() => {
@ -290,6 +295,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
// Reinitialize tables
setDetailedDataTableData([]);
setAssociatedEquipmentTableData([]);
let isResponseOK = false;
fetch(APIBaseURL + '/reports/combinedequipmentoutput?' +
@ -406,6 +412,38 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
});
setDetailedDataTableColumns(detailed_column_list);
let associated_equipment_value_list = [];
if (json['associated_equipment']['associated_equipment_names_array'].length > 0) {
json['associated_equipment']['associated_equipment_names_array'][0].forEach((currentEquipmentName, equipmentIndex) => {
let associated_equipment_value = {};
associated_equipment_value['id'] = equipmentIndex;
associated_equipment_value['name'] = currentEquipmentName;
json['associated_equipment']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => {
associated_equipment_value['a' + energyCategoryIndex] = json['associated_equipment']['subtotals_array'][energyCategoryIndex][equipmentIndex].toFixed(2);
});
associated_equipment_value_list.push(associated_equipment_value);
});
};
setAssociatedEquipmentTableData(associated_equipment_value_list);
let associated_equipment_column_list = [];
associated_equipment_column_list.push({
dataField: 'name',
text: t('Associated Equipment'),
sort: true
});
json['associated_equipment']['energy_category_names'].forEach((currentValue, index) => {
let unit = json['associated_equipment']['units'][index];
associated_equipment_column_list.push({
dataField: 'a' + index,
text: currentValue + ' (' + unit + ')',
sort: true
});
});
setAssociatedEquipmentTableColumns(associated_equipment_column_list);
setExcelBytesBase64(json['excel_bytes_base64']);
// enable submit button
@ -615,6 +653,9 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
<br />
<DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
</DetailedDataTable>
<br />
<AssociatedEquipmentTable data={associatedEquipmentTableData} title={t('Associated Equipment Data')} columns={associatedEquipmentTableColumns}>
</AssociatedEquipmentTable>
</Fragment>
);