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

changed the decimals to 0 for CountUp of cardsummyItems in dashboard

pull/12/MERGE
13621160019@163.com 2021-03-08 19:36:36 +08:00
parent b7b991fd62
commit c22e05af3f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/components/MyEMS/dashboard/Dashboard.js
View File

@ -108,7 +108,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
let cardSummaryItem = {} let cardSummaryItem = {}
cardSummaryItem['name'] = json['reporting_period_input']['names'][index]; cardSummaryItem['name'] = json['reporting_period_input']['names'][index];
cardSummaryItem['unit'] = json['reporting_period_input']['units'][index]; cardSummaryItem['unit'] = json['reporting_period_input']['units'][index];
cardSummaryItem['subtotal'] = Math.round(json['reporting_period_input']['subtotals'][index]); cardSummaryItem['subtotal'] = json['reporting_period_input']['subtotals'][index];
cardSummaryItem['increment_rate'] = parseFloat(json['reporting_period_input']['increment_rates'][index] * 100).toFixed(2) + "%"; cardSummaryItem['increment_rate'] = parseFloat(json['reporting_period_input']['increment_rates'][index] * 100).toFixed(2) + "%";
cardSummaryItem['subtotal_per_unit_area'] = json['reporting_period_input']['subtotals_per_unit_area'][index]; cardSummaryItem['subtotal_per_unit_area'] = json['reporting_period_input']['subtotals_per_unit_area'][index];
inputCardSummaryArray.push(cardSummaryItem); inputCardSummaryArray.push(cardSummaryItem);
@ -120,7 +120,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
let cardSummaryItem = {} let cardSummaryItem = {}
cardSummaryItem['name'] = json['reporting_period_cost']['names'][index]; cardSummaryItem['name'] = json['reporting_period_cost']['names'][index];
cardSummaryItem['unit'] = json['reporting_period_cost']['units'][index]; cardSummaryItem['unit'] = json['reporting_period_cost']['units'][index];
cardSummaryItem['subtotal'] = Math.round(json['reporting_period_cost']['subtotals'][index]); cardSummaryItem['subtotal'] = json['reporting_period_cost']['subtotals'][index];
cardSummaryItem['increment_rate'] = parseFloat(json['reporting_period_cost']['increment_rates'][index] * 100).toFixed(2) + "%"; cardSummaryItem['increment_rate'] = parseFloat(json['reporting_period_cost']['increment_rates'][index] * 100).toFixed(2) + "%";
cardSummaryItem['subtotal_per_unit_area'] = json['reporting_period_cost']['subtotals_per_unit_area'][index]; cardSummaryItem['subtotal_per_unit_area'] = json['reporting_period_cost']['subtotals_per_unit_area'][index];
costCardSummaryArray.push(cardSummaryItem); costCardSummaryArray.push(cardSummaryItem);
@ -363,7 +363,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
footnote={t('Per Unit Area')} footnote={t('Per Unit Area')}
footvalue={cardSummaryItem['subtotal_per_unit_area']} footvalue={cardSummaryItem['subtotal_per_unit_area']}
footunit={"(" + cardSummaryItem['unit'] + "/M²)"} > footunit={"(" + cardSummaryItem['unit'] + "/M²)"} >
{cardSummaryItem['subtotal'] && <CountUp end={cardSummaryItem['subtotal']} duration={2} prefix="" separator="," decimal="." decimals={2} />} {cardSummaryItem['subtotal'] && <CountUp end={cardSummaryItem['subtotal']} duration={2} prefix="" separator="," decimal="." decimals={0} />}
</CardSummary> </CardSummary>
))} ))}
{costCardSummaryList.map(cardSummaryItem => ( {costCardSummaryList.map(cardSummaryItem => (
@ -374,7 +374,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
footnote={t('Per Unit Area')} footnote={t('Per Unit Area')}
footvalue={cardSummaryItem['subtotal_per_unit_area']} footvalue={cardSummaryItem['subtotal_per_unit_area']}
footunit={"(" + cardSummaryItem['unit'] + "/M²)"} > footunit={"(" + cardSummaryItem['unit'] + "/M²)"} >
{cardSummaryItem['subtotal'] && <CountUp end={cardSummaryItem['subtotal']} duration={2} prefix="" separator="," decimal="." decimals={2} />} {cardSummaryItem['subtotal'] && <CountUp end={cardSummaryItem['subtotal']} duration={2} prefix="" separator="," decimal="." decimals={0} />}
</CardSummary> </CardSummary>
))} ))}
<CardSummary <CardSummary