Merge branch 'develop'

MyEMS · May 22, 2024 · f984319 · f984319
2 parents d2d2e79 + 19cf43e
commit f984319
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 ### Changed
 ### Fixed
+- fixed totalRatedCapacity and totalRatedPower issue in microgrid dashboard and energy storage power station dashboard
 ### Removed
 
 ## [v4.5.0] - 2024-05-21

diff --git a/myems-web/src/components/MyEMS/EnergyStoragePowerStation/CollectionDashboard.js b/myems-web/src/components/MyEMS/EnergyStoragePowerStation/CollectionDashboard.js
@@ -399,10 +399,10 @@ const CollectionDashboard = ({ setRedirect, setRedirectUrl, t }) => {
           {1 && <CountUp end={energyStoragePowerStationList.length} duration={2} prefix="" separator="," decimal="." decimals={0} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Rated Power')} footunit={'kW'} color="ratedPower">
-          {1 && <CountUp end={totalRatedCapacity} duration={2} prefix="" separator="," decimal="." decimals={2} />}
+          {1 && <CountUp end={totalRatedPower} duration={2} prefix="" separator="," decimal="." decimals={2} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'kWh'} color="ratedCapacity">
-          {1 && <CountUp end={totalRatedPower} duration={2} prefix="" separator="," decimal="." decimals={2} />}
+          {1 && <CountUp end={totalRatedCapacity} duration={2} prefix="" separator="," decimal="." decimals={2} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Charge')} footunit={'kWh'} color="electricity">
           {1 && <CountUp end={totalCharge} duration={2} prefix="" separator="," decimal="." decimals={2} />}

diff --git a/myems-web/src/components/MyEMS/EnergyStoragePowerStation/Dashboard.js b/myems-web/src/components/MyEMS/EnergyStoragePowerStation/Dashboard.js
@@ -399,10 +399,10 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
           {1 && <CountUp end={energyStoragePowerStationList.length} duration={2} prefix="" separator="," decimal="." decimals={0} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Rated Power')} footunit={'kW'} color="ratedPower">
-          {1 && <CountUp end={totalRatedCapacity} duration={2} prefix="" separator="," decimal="." decimals={2} />}
+          {1 && <CountUp end={totalRatedPower} duration={2} prefix="" separator="," decimal="." decimals={2} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'kWh'} color="ratedCapacity">
-          {1 && <CountUp end={totalRatedPower} duration={2} prefix="" separator="," decimal="." decimals={2} />}
+          {1 && <CountUp end={totalRatedCapacity} duration={2} prefix="" separator="," decimal="." decimals={2} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Charge')} footunit={'kWh'} color="electricity">
           {1 && <CountUp end={totalCharge} duration={2} prefix="" separator="," decimal="." decimals={2} />}

diff --git a/myems-web/src/components/MyEMS/Microgrid/Dashboard.js b/myems-web/src/components/MyEMS/Microgrid/Dashboard.js
@@ -425,10 +425,10 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
           {1 && <CountUp end={microgridList.length} duration={2} prefix="" separator="," decimal="." decimals={0} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Rated Power')} footunit={'kW'} color="ratedPower">
-          {1 && <CountUp end={totalRatedCapacity} duration={2} prefix="" separator="," decimal="." decimals={2} />}
+          {1 && <CountUp end={totalRatedPower} duration={2} prefix="" separator="," decimal="." decimals={2} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Rated Capacity')} footunit={'kWh'} color="ratedCapacity">
-          {1 && <CountUp end={totalRatedPower} duration={2} prefix="" separator="," decimal="." decimals={2} />}
+          {1 && <CountUp end={totalRatedCapacity} duration={2} prefix="" separator="," decimal="." decimals={2} />}
         </CardSummary>
         <CardSummary rate={''} title={t('Total Charge')} footunit={'kWh'} color="electricity">
           {1 && <CountUp end={totalCharge} duration={2} prefix="" separator="," decimal="." decimals={2} />}