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

fixed issue 192

pull/122/head
Caozhenhui 2022-02-11 01:33:23 +08:00
parent 154a2a859e
commit 3dcd03218e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/components/MyEMS/Meter/MeterEnergy.js
View File

@ -262,6 +262,9 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
}; };
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => { let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
if(reportingPeriodEndsDatetime < newDateTime){
newDateTime = reportingPeriodBeginsDatetime;
}
setReportingPeriodBeginsDatetime(newDateTime); setReportingPeriodBeginsDatetime(newDateTime);
if (comparisonType === 'year-over-year') { if (comparisonType === 'year-over-year') {
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years')); setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
@ -271,6 +274,9 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
}; };
let onReportingPeriodEndsDatetimeChange = (newDateTime) => { let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
if(reportingPeriodBeginsDatetime > newDateTime){
newDateTime = reportingPeriodEndsDatetime;
}
setReportingPeriodEndsDatetime(newDateTime); setReportingPeriodEndsDatetime(newDateTime);
if (comparisonType === 'year-over-year') { if (comparisonType === 'year-over-year') {
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years')); setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
@ -428,8 +434,6 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
} else { } else {
toast.error(json.description) toast.error(json.description)
setSpinnerHidden(true);
setSubmitButtonDisabled(false);
} }
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);