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

Merge branch 'develop'

pull/12/head
13621160019@163.com 2021-02-23 14:18:43 +08:00
parent da60ef36ec d59d0a7f1d
commit c716290547
7 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG Normal file
View File

@ -0,0 +1,4 @@
v1.0.6:
1. fixed energy category names and units issue in EnergyItem reports.

12
web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js
View File

@ -330,6 +330,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setCardSummaryList(cardSummaryArray); setCardSummaryList(cardSummaryArray);
let sharePieDict = {} let sharePieDict = {}
let energyCategoryDict = {};
json['reporting_period']['names'].forEach((currentValue, index) => { json['reporting_period']['names'].forEach((currentValue, index) => {
let sharePieSubItem = {} let sharePieSubItem = {}
sharePieSubItem['id'] = index; sharePieSubItem['id'] = index;
@ -344,13 +345,20 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id] = [];
sharePieDict[current_energy_category_id].push(sharePieSubItem); sharePieDict[current_energy_category_id].push(sharePieSubItem);
} }
if (!(current_energy_category_id in energyCategoryDict)) {
energyCategoryDict[current_energy_category_id] =
{'name': json['reporting_period']['energy_category_names'][index],
'unit': json['reporting_period']['units'][index],
}
}
}); });
let sharePieArray = []; let sharePieArray = [];
for (let current_energy_category_id in sharePieDict) { for (let current_energy_category_id in sharePieDict) {
let sharePieItem = {} let sharePieItem = {}
sharePieItem['data'] = sharePieDict[current_energy_category_id]; sharePieItem['data'] = sharePieDict[current_energy_category_id];
sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name'];
sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit'];
sharePieArray.push(sharePieItem); sharePieArray.push(sharePieItem);
} }

12
web/src/components/MyEMS/Equipment/EquipmentEnergyItem.js
View File

@ -332,6 +332,7 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setCardSummaryList(cardSummaryArray); setCardSummaryList(cardSummaryArray);
let sharePieDict = {} let sharePieDict = {}
let energyCategoryDict = {};
json['reporting_period']['names'].forEach((currentValue, index) => { json['reporting_period']['names'].forEach((currentValue, index) => {
let sharePieSubItem = {} let sharePieSubItem = {}
sharePieSubItem['id'] = index; sharePieSubItem['id'] = index;
@ -346,13 +347,20 @@ const EquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id] = [];
sharePieDict[current_energy_category_id].push(sharePieSubItem); sharePieDict[current_energy_category_id].push(sharePieSubItem);
} }
if (!(current_energy_category_id in energyCategoryDict)) {
energyCategoryDict[current_energy_category_id] =
{'name': json['reporting_period']['energy_category_names'][index],
'unit': json['reporting_period']['units'][index],
}
}
}); });
let sharePieArray = []; let sharePieArray = [];
for (let current_energy_category_id in sharePieDict) { for (let current_energy_category_id in sharePieDict) {
let sharePieItem = {} let sharePieItem = {}
sharePieItem['data'] = sharePieDict[current_energy_category_id]; sharePieItem['data'] = sharePieDict[current_energy_category_id];
sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name'];
sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit'];
sharePieArray.push(sharePieItem); sharePieArray.push(sharePieItem);
} }

12
web/src/components/MyEMS/Shopfloor/ShopfloorEnergyItem.js
View File

@ -334,6 +334,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setCardSummaryList(cardSummaryArray); setCardSummaryList(cardSummaryArray);
let sharePieDict = {} let sharePieDict = {}
let energyCategoryDict = {};
json['reporting_period']['names'].forEach((currentValue, index) => { json['reporting_period']['names'].forEach((currentValue, index) => {
let sharePieSubItem = {} let sharePieSubItem = {}
sharePieSubItem['id'] = index; sharePieSubItem['id'] = index;
@ -348,13 +349,20 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id] = [];
sharePieDict[current_energy_category_id].push(sharePieSubItem); sharePieDict[current_energy_category_id].push(sharePieSubItem);
} }
if (!(current_energy_category_id in energyCategoryDict)) {
energyCategoryDict[current_energy_category_id] =
{'name': json['reporting_period']['energy_category_names'][index],
'unit': json['reporting_period']['units'][index],
}
}
}); });
let sharePieArray = []; let sharePieArray = [];
for (let current_energy_category_id in sharePieDict) { for (let current_energy_category_id in sharePieDict) {
let sharePieItem = {} let sharePieItem = {}
sharePieItem['data'] = sharePieDict[current_energy_category_id]; sharePieItem['data'] = sharePieDict[current_energy_category_id];
sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name'];
sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit'];
sharePieArray.push(sharePieItem); sharePieArray.push(sharePieItem);
} }

14
web/src/components/MyEMS/Space/SpaceEnergyItem.js
View File

@ -263,7 +263,8 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
}); });
setCardSummaryList(cardSummaryArray); setCardSummaryList(cardSummaryArray);
let sharePieDict = {} let sharePieDict = {};
let energyCategoryDict = {};
json['reporting_period']['names'].forEach((currentValue, index) => { json['reporting_period']['names'].forEach((currentValue, index) => {
let sharePieSubItem = {} let sharePieSubItem = {}
sharePieSubItem['id'] = index; sharePieSubItem['id'] = index;
@ -278,13 +279,20 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id] = [];
sharePieDict[current_energy_category_id].push(sharePieSubItem); sharePieDict[current_energy_category_id].push(sharePieSubItem);
} }
if (!(current_energy_category_id in energyCategoryDict)) {
energyCategoryDict[current_energy_category_id] =
{'name': json['reporting_period']['energy_category_names'][index],
'unit': json['reporting_period']['units'][index],
}
}
}); });
let sharePieArray = []; let sharePieArray = [];
for (let current_energy_category_id in sharePieDict) { for (let current_energy_category_id in sharePieDict) {
let sharePieItem = {} let sharePieItem = {}
sharePieItem['data'] = sharePieDict[current_energy_category_id]; sharePieItem['data'] = sharePieDict[current_energy_category_id];
sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name'];
sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit'];
sharePieArray.push(sharePieItem); sharePieArray.push(sharePieItem);
} }

12
web/src/components/MyEMS/Store/StoreEnergyItem.js
View File

@ -334,6 +334,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setCardSummaryList(cardSummaryArray); setCardSummaryList(cardSummaryArray);
let sharePieDict = {} let sharePieDict = {}
let energyCategoryDict = {};
json['reporting_period']['names'].forEach((currentValue, index) => { json['reporting_period']['names'].forEach((currentValue, index) => {
let sharePieSubItem = {} let sharePieSubItem = {}
sharePieSubItem['id'] = index; sharePieSubItem['id'] = index;
@ -348,13 +349,20 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id] = [];
sharePieDict[current_energy_category_id].push(sharePieSubItem); sharePieDict[current_energy_category_id].push(sharePieSubItem);
} }
if (!(current_energy_category_id in energyCategoryDict)) {
energyCategoryDict[current_energy_category_id] =
{'name': json['reporting_period']['energy_category_names'][index],
'unit': json['reporting_period']['units'][index],
}
}
}); });
let sharePieArray = []; let sharePieArray = [];
for (let current_energy_category_id in sharePieDict) { for (let current_energy_category_id in sharePieDict) {
let sharePieItem = {} let sharePieItem = {}
sharePieItem['data'] = sharePieDict[current_energy_category_id]; sharePieItem['data'] = sharePieDict[current_energy_category_id];
sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name'];
sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit'];
sharePieArray.push(sharePieItem); sharePieArray.push(sharePieItem);
} }

12
web/src/components/MyEMS/Tenant/TenantEnergyItem.js
View File

@ -334,6 +334,7 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
setCardSummaryList(cardSummaryArray); setCardSummaryList(cardSummaryArray);
let sharePieDict = {} let sharePieDict = {}
let energyCategoryDict = {};
json['reporting_period']['names'].forEach((currentValue, index) => { json['reporting_period']['names'].forEach((currentValue, index) => {
let sharePieSubItem = {} let sharePieSubItem = {}
sharePieSubItem['id'] = index; sharePieSubItem['id'] = index;
@ -348,13 +349,20 @@ const TenantEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
sharePieDict[current_energy_category_id] = []; sharePieDict[current_energy_category_id] = [];
sharePieDict[current_energy_category_id].push(sharePieSubItem); sharePieDict[current_energy_category_id].push(sharePieSubItem);
} }
if (!(current_energy_category_id in energyCategoryDict)) {
energyCategoryDict[current_energy_category_id] =
{'name': json['reporting_period']['energy_category_names'][index],
'unit': json['reporting_period']['units'][index],
}
}
}); });
let sharePieArray = []; let sharePieArray = [];
for (let current_energy_category_id in sharePieDict) { for (let current_energy_category_id in sharePieDict) {
let sharePieItem = {} let sharePieItem = {}
sharePieItem['data'] = sharePieDict[current_energy_category_id]; sharePieItem['data'] = sharePieDict[current_energy_category_id];
sharePieItem['energy_category_name'] = json['reporting_period']['energy_category_names'][current_energy_category_id]; sharePieItem['energy_category_name'] = energyCategoryDict[current_energy_category_id]['name'];
sharePieItem['unit'] = json['reporting_period']['units'][current_energy_category_id]; sharePieItem['unit'] = energyCategoryDict[current_energy_category_id]['unit'];
sharePieArray.push(sharePieItem); sharePieArray.push(sharePieItem);
} }