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

Merge branch 'develop'

pull/133/head
13621160019@163.com 2022-02-27 14:36:24 +08:00
parent e4db7bc446 afc36b98ea
commit f3275d64fa
12 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/src/components/MyEMS/Meter/MeterBatch.js
View File

@ -296,14 +296,13 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

6
web/src/components/MyEMS/Meter/MeterCarbon.js
View File

@ -531,14 +531,13 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -549,14 +548,13 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

6
web/src/components/MyEMS/Meter/MeterCost.js
View File

@ -531,14 +531,13 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -549,14 +548,13 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

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

@ -261,6 +261,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
} }
}; };
// Callback fired when value changed
let onBasePeriodChange = (DateRange) => { let onBasePeriodChange = (DateRange) => {
console.log(DateRange); console.log(DateRange);
@ -271,6 +272,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
} }
}; };
// Callback fired when value changed
let onReportingPeriodChange = (DateRange) => { let onReportingPeriodChange = (DateRange) => {
if(DateRange == null) { if(DateRange == null) {
setReportingPeriodDateRange([null, null]); setReportingPeriodDateRange([null, null]);
@ -284,14 +286,16 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
} }
}; };
// Callback fired when value clean
let onBasePeriodClean = event => { let onBasePeriodClean = event => {
setBasePeriodDateRange([null, null]); setBasePeriodDateRange([null, null]);
}; };
// Callback fired when value clean
let onReportingPeriodClean = event => { let onReportingPeriodClean = event => {
setReportingPeriodDateRange([null, null]); setReportingPeriodDateRange([null, null]);
}; };
// Handler // Handler
const handleSubmit = e => { const handleSubmit = e => {
e.preventDefault(); e.preventDefault();
@ -536,14 +540,13 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -554,14 +557,13 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

3
web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
View File

@ -465,14 +465,13 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

3
web/src/components/MyEMS/Meter/MeterTracking.js
View File

@ -350,14 +350,13 @@ const MeterTracking = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

3
web/src/components/MyEMS/Meter/MeterTrend.js
View File

@ -429,14 +429,13 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

6
web/src/components/MyEMS/Meter/OfflineMeterCost.js
View File

@ -507,14 +507,13 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -525,14 +524,13 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

6
web/src/components/MyEMS/Meter/OfflineMeterEnergy.js
View File

@ -509,14 +509,13 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -527,14 +526,13 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

6
web/src/components/MyEMS/Meter/VirtualMeterCarbon.js
View File

@ -506,14 +506,13 @@ const VirtualMeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -524,14 +523,13 @@ const VirtualMeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

6
web/src/components/MyEMS/Meter/VirtualMeterCost.js
View File

@ -507,14 +507,13 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -525,14 +524,13 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>

6
web/src/components/MyEMS/Meter/VirtualMeterEnergy.js
View File

@ -508,14 +508,13 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker <DateRangePicker
id='basePeriodDateRangePicker' id='basePeriodDateRangePicker'
readOnly={basePeriodDateRangePickerDisabled} readOnly={basePeriodDateRangePickerDisabled}
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={basePeriodDateRange} value={basePeriodDateRange}
onChange={onBasePeriodChange} onChange={onBasePeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onBasePeriodClean} onClean={onBasePeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>
@ -526,14 +525,13 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<br/> <br/>
<DateRangePicker <DateRangePicker
id='reportingPeriodDateRangePicker' id='reportingPeriodDateRangePicker'
format="yyyy-MM-dd hh:mm aa" format="yyyy-MM-dd HH:mm:ss"
value={reportingPeriodDateRange} value={reportingPeriodDateRange}
onChange={onReportingPeriodChange} onChange={onReportingPeriodChange}
size="md" size="md"
style={dateRangePickerStyle} style={dateRangePickerStyle}
onClean={onReportingPeriodClean} onClean={onReportingPeriodClean}
locale={dateRangePickerLocale} locale={dateRangePickerLocale}
showMeridian
placeholder={t("Select Date Range")} placeholder={t("Select Date Range")}
/> />
</FormGroup> </FormGroup>