Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
nengyuanzhang committed Feb 8, 2025
2 parents 88f8053 + 4d3aeb2 commit 5c1ff8b
Show file tree
Hide file tree
Showing 11 changed files with 3,290 additions and 17 deletions.
528 changes: 528 additions & 0 deletions myems-web/src/components/MyEMS/Microgrid/CollectionDashboard.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions myems-web/src/components/MyEMS/Microgrid/Dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
})
.then(json => {
if (isResponseOK) {

console.log(json);
// hide spinner
setSpinnerHidden(true);

Expand Down Expand Up @@ -223,7 +223,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
})
.then(json => {
if (isResponseOK) {

console.log(json);

setChargeEnergyData({
"unit": "kWh",
Expand Down Expand Up @@ -293,7 +293,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
})
.then(json => {
if (isResponseOK) {

console.log(json);

setChargeBillingData({
"unit": currency,
Expand Down Expand Up @@ -364,7 +364,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
})
.then(json => {
if (isResponseOK) {

console.log(json);

setChargeCarbonData({
"unit": "kgCO2",
Expand Down
Loading

0 comments on commit 5c1ff8b

Please sign in to comment.