diff --git a/web/src/components/MyEMS/Space/SpaceCost.js b/web/src/components/MyEMS/Space/SpaceCost.js index 32fc073c..024de40a 100644 --- a/web/src/components/MyEMS/Space/SpaceCost.js +++ b/web/src/components/MyEMS/Space/SpaceCost.js @@ -84,7 +84,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { const [spaceLineChartData, setSpaceLineChartData] = useState({}); const [spaceLineChartOptions, setSpaceLineChartOptions] = useState([]); const [childSpaceProportionList, setChildSpaceProportionList] = useState([]); - const [childSpacetotalProportion, setChildSpacetotalProportion] = useState([]); + const [childSpaceSubtotalShareData, setChildSpaceSubtotalShareData] = useState([]); const [parameterLineChartLabels, setParameterLineChartLabels] = useState([]); const [parameterLineChartData, setParameterLineChartData] = useState({}); @@ -342,23 +342,22 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { }); setChildSpaceProportionList(childSpaceProportionArray); - let childSpacesProportionArray = []; + let childSpaceSubtotalShareDataArray = []; if (json['child_space']['child_space_names_array'].length > 0) { json['child_space']['child_space_names_array'][0].forEach((currentSpaceName, spaceIndex) => { - let total = 0.0; + let subtotal = 0.0; json['child_space']['energy_category_names'].forEach((currentValue, energyCategoryIndex) => { - total += json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex] - total = total.toFixed() + subtotal += json['child_space']['subtotals_array'][energyCategoryIndex][spaceIndex]; }); - let childSpacesProportionItemDataItem = {}; - childSpacesProportionItemDataItem['id'] = spaceIndex; - childSpacesProportionItemDataItem['name'] = currentSpaceName; - childSpacesProportionItemDataItem['value'] = total; - childSpacesProportionItemDataItem['color'] = "#"+((1<<24)*Math.random()|0).toString(16); - childSpacesProportionArray.push(childSpacesProportionItemDataItem); + let childSpaceSubtotalDataItem = {}; + childSpaceSubtotalDataItem['id'] = spaceIndex; + childSpaceSubtotalDataItem['name'] = currentSpaceName; + childSpaceSubtotalDataItem['value'] = subtotal; + childSpaceSubtotalDataItem['color'] = "#"+((1<<24)*Math.random()|0).toString(16); + childSpaceSubtotalShareDataArray.push(childSpaceSubtotalDataItem); }); }; - setChildSpacetotalProportion(childSpacesProportionArray); + setChildSpaceSubtotalShareData(childSpaceSubtotalShareDataArray); let timestamps = {} json['reporting_period']['timestamps'].forEach((currentValue, index) => { @@ -689,12 +688,12 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => { /> ))} - - - + + +