Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nengyuanzhang
nengyuanzhang committed May 19, 2024
2 parents 655ac58 + 9fcedf5 commit b958d0a
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 21 deletions.
6 changes: 3 additions & 3 deletions myems-web/src/components/MyEMS/EnergyStoragePowerStation/CollectionDashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ const CollectionDashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('1');
}}
>
<h6>电量指标</h6>
<h6>{t('Energy Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -436,7 +436,7 @@ const CollectionDashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('2');
}}
>
<h6>收益指标</h6>
<h6>{t('Revenue Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -446,7 +446,7 @@ const CollectionDashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('3');
}}
>
<h6>节能减排</h6>
<h6>{t('Carbon Indicator')}</h6>
</NavLink>
</NavItem>
</Nav>
Expand Down
6 changes: 3 additions & 3 deletions myems-web/src/components/MyEMS/EnergyStoragePowerStation/Dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('1');
}}
>
<h6>电量指标</h6>
<h6>{t('Energy Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -436,7 +436,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('2');
}}
>
<h6>收益指标</h6>
<h6>{t('Revenue Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -446,7 +446,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('3');
}}
>
<h6>节能减排</h6>
<h6>{t('Carbon Indicator')}</h6>
</NavLink>
</NavItem>
</Nav>
Expand Down
6 changes: 3 additions & 3 deletions myems-web/src/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ const EnergyStoragePowerStationDetails = ({ setRedirect, setRedirectUrl, t }) =>
toggleTabLeft('1');
}}
>
<h6>电量指标</h6>
<h6>{t('Energy Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -435,7 +435,7 @@ const EnergyStoragePowerStationDetails = ({ setRedirect, setRedirectUrl, t }) =>
toggleTabLeft('2');
}}
>
<h6>收益指标</h6>
<h6>{t('Revenue Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -445,7 +445,7 @@ const EnergyStoragePowerStationDetails = ({ setRedirect, setRedirectUrl, t }) =>
toggleTabLeft('3');
}}
>
<h6>节能减排</h6>
<h6>{t('Carbon Indicator')}</h6>
</NavLink>
</NavItem>
</Nav>
Expand Down
6 changes: 3 additions & 3 deletions myems-web/src/components/MyEMS/EnergyStoragePowerStation/ItemDashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ const ItemDashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('1');
}}
>
<h6>电量指标</h6>
<h6>{t('Energy Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -617,7 +617,7 @@ const ItemDashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('2');
}}
>
<h6>收益指标</h6>
<h6>{t('Revenue Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -627,7 +627,7 @@ const ItemDashboard = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('3');
}}
>
<h6>节能减排</h6>
<h6>{t('Carbon Indicator')}</h6>
</NavLink>
</NavItem>
</Nav>
Expand Down
14 changes: 5 additions & 9 deletions myems-web/src/components/MyEMS/Microgrid/MicrogridDetails.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ const MicrogridDetails = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('1');
}}
>
<h6>{t('Energy')}</h6>
<h6>{t('Energy Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -775,7 +775,7 @@ const MicrogridDetails = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('2');
}}
>
<h6>{t('Revenue')}</h6>
<h6>{t('Revenue Indicator')}</h6>
</NavLink>
</NavItem>
<NavItem className="cursor-pointer">
Expand All @@ -785,7 +785,7 @@ const MicrogridDetails = ({ setRedirect, setRedirectUrl, t }) => {
toggleTabLeft('3');
}}
>
<h6>Carbon</h6>
<h6>{t('Carbon Indicator')}</h6>
</NavLink>
</NavItem>
</Nav>
Expand All @@ -797,11 +797,11 @@ const MicrogridDetails = ({ setRedirect, setRedirectUrl, t }) => {
<Table borderless className="fs--1 mb-0">
<tbody>
<tr className="border-bottom">
<th className="pl-0">{t('Today\'s Charge')}</th>
<th className="pl-0">{t("Today's Charge")}</th>
<th className="pr-0 text-right">100 kWh</th>
</tr>
<tr className="border-bottom">
<th className="pl-0">{t('Today\'s Discharge')}</th>
<th className="pl-0">{t("Today's Discharge")}</th>
<th className="pr-0 text-right ">90 kWh</th>
</tr>
<tr className="border-bottom">
Expand All @@ -816,10 +816,6 @@ const MicrogridDetails = ({ setRedirect, setRedirectUrl, t }) => {
<th className="pl-0 pb-0">{t('Efficiency')}</th>
<th className="pr-0 text-right">90%</th>
</tr>
<tr className="border-bottom">
<th className="pl-0 pb-0">{t('Discharge Rate')}</th>
<th className="pr-0 text-right">80%</th>
</tr>
</tbody>
</Table>
</CardBody>
Expand Down

0 comments on commit b958d0a

Please sign in to comment.