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

Fixed some bugs

pull/52/head
tianlinzhong 2021-07-27 18:40:25 +08:00
parent c6eef934dd
commit 4e866dbc58
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/src/components/MyEMS/Space/SpaceCost.js
View File

@ -84,7 +84,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
const [spaceLineChartData, setSpaceLineChartData] = useState({}); const [spaceLineChartData, setSpaceLineChartData] = useState({});
const [spaceLineChartOptions, setSpaceLineChartOptions] = useState([]); const [spaceLineChartOptions, setSpaceLineChartOptions] = useState([]);
const [childSpaceProportionList, setChildSpaceProportionList] = useState([]); const [childSpaceProportionList, setChildSpaceProportionList] = useState([]);
const [childSpacesProportionList, setChildSpacesProportionList] = useState([]); const [childSpacetotalProportion, setChildSpacetotalProportion] = useState([]);
const [parameterLineChartLabels, setParameterLineChartLabels] = useState([]); const [parameterLineChartLabels, setParameterLineChartLabels] = useState([]);
const [parameterLineChartData, setParameterLineChartData] = useState({}); const [parameterLineChartData, setParameterLineChartData] = useState({});
@ -344,26 +344,21 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
let childSpacesProportionArray = []; let childSpacesProportionArray = [];
if (json['child_space']['child_space_names_array'].length > 0) { if (json['child_space']['child_space_names_array'].length > 0) {
let childSpacesProportionItem = {}
childSpacesProportionItem['data'] = []
json['child_space']['child_space_names_array'][0].forEach((currentSpaceName, spaceIndex) => { json['child_space']['child_space_names_array'][0].forEach((currentSpaceName, spaceIndex) => {
let total = 0.0; let total = 0.0;
json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => {
total += json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex] total += json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex]
// total = total.toFixed() total = total.toFixed()
}); });
let childSpacesProportionItemDataItem = {}; let childSpacesProportionItemDataItem = {};
childSpacesProportionItemDataItem['id'] = spaceIndex; childSpacesProportionItemDataItem['id'] = spaceIndex;
childSpacesProportionItemDataItem['name'] = currentSpaceName; childSpacesProportionItemDataItem['name'] = currentSpaceName;
childSpacesProportionItemDataItem['value'] = total; childSpacesProportionItemDataItem['value'] = total;
childSpacesProportionItemDataItem['color'] = "#"+((1<<24)*Math.random()|0).toString(16); childSpacesProportionItemDataItem['color'] = "#"+((1<<24)*Math.random()|0).toString(16);
childSpacesProportionItem['data'].push(childSpacesProportionItemDataItem); childSpacesProportionArray.push(childSpacesProportionItemDataItem);
}); });
childSpacesProportionItem['name'] = "";
childSpacesProportionItem['unit'] = "";
childSpacesProportionArray.push(childSpacesProportionItem);
}; };
setChildSpacesProportionList(childSpacesProportionArray); setChildSpacetotalProportion(childSpacesProportionArray);
let timestamps = {} let timestamps = {}
json['reporting_period']['timestamps'].forEach((currentValue, index) => { json['reporting_period']['timestamps'].forEach((currentValue, index) => {
@ -694,17 +689,13 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
/> />
</Col> </Col>
))} ))}
{childSpacesProportionList.map(childSpacesProportionItem => (
<Col className="mb-3 pr-lg-2 mb-3"> <Col className="mb-3 pr-lg-2 mb-3">
<SharePie <SharePie
data={childSpacesProportionItem['data']} data={childSpacetotalProportion}
title={t('总成本占比', title={t('Child Space total Proportion CATEGORY UNIT')}
{'CATEGORY': childSpacesProportionItem['name'],
'UNIT': childSpacesProportionItem['unit']
})}
/> />
</Col> </Col>
))}
</Row> </Row>
<LineChart reportingTitle={t('Reporting Period Costs CATEGORY VALUE UNIT', { 'CATEGORY': null, 'VALUE': null, 'UNIT': null })} <LineChart reportingTitle={t('Reporting Period Costs CATEGORY VALUE UNIT', { 'CATEGORY': null, 'VALUE': null, 'UNIT': null })}
baseTitle='' baseTitle=''

1
web/src/i18n.js
View File

@ -838,6 +838,7 @@ const resources = {
"Incomes by Energy Category": "收入占比", "Incomes by Energy Category": "收入占比",
"Electricity Consumption by Time-Of-Use": "分时消耗电量", "Electricity Consumption by Time-Of-Use": "分时消耗电量",
"Electricity Cost by Time-Of-Use": "分时用电成本", "Electricity Cost by Time-Of-Use": "分时用电成本",
"Child Space total Proportion CATEGORY UNIT": "子空间总成本占比",
"CATEGORY UNIT Consumption by Energy Items": "{{CATEGORY}} {{UNIT}} 分项消耗占比", "CATEGORY UNIT Consumption by Energy Items": "{{CATEGORY}} {{UNIT}} 分项消耗占比",
"Ton of Standard Coal by Energy Category": "吨标准煤(TCE)占比", "Ton of Standard Coal by Energy Category": "吨标准煤(TCE)占比",
"Ton of Carbon Dioxide Emissions by Energy Category": "吨二氧化碳排放(TCO2E)占比", "Ton of Carbon Dioxide Emissions by Energy Category": "吨二氧化碳排放(TCO2E)占比",