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

fixed selected meter issues in onSearchMeter of Web UI

pull/47/head
13621160019@163.com 2021-07-05 13:54:21 +08:00
parent ad78ba8741
commit 8df28f4655
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,15 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
meter => meter.label.toLowerCase().includes(keyword) meter => meter.label.toLowerCase().includes(keyword)
); );
setFilteredMeterList(keyword.length ? filteredResult : meterList); setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button
setSubmitButtonDisabled(false);
} else {
setSelectedMeter(undefined);
// disable submit button
setSubmitButtonDisabled(true);
};
}; };
let onComparisonTypeChange = ({ target }) => { let onComparisonTypeChange = ({ target }) => {

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

@ -243,6 +243,15 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
meter => meter.label.toLowerCase().includes(keyword) meter => meter.label.toLowerCase().includes(keyword)
); );
setFilteredMeterList(keyword.length ? filteredResult : meterList); setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button
setSubmitButtonDisabled(false);
} else {
setSelectedMeter(undefined);
// disable submit button
setSubmitButtonDisabled(true);
};
}; };
let onBasePeriodBeginsDatetimeChange = (newDateTime) => { let onBasePeriodBeginsDatetimeChange = (newDateTime) => {

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

@ -212,6 +212,15 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
meter => meter.label.toLowerCase().includes(keyword) meter => meter.label.toLowerCase().includes(keyword)
); );
setFilteredMeterList(keyword.length ? filteredResult : meterList); setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button
setSubmitButtonDisabled(false);
} else {
setSelectedMeter(undefined);
// disable submit button
setSubmitButtonDisabled(true);
};
}; };
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => { let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {

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

@ -201,6 +201,15 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
meter => meter.label.toLowerCase().includes(keyword) meter => meter.label.toLowerCase().includes(keyword)
); );
setFilteredMeterList(keyword.length ? filteredResult : meterList); setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button
setSubmitButtonDisabled(false);
} else {
setSelectedMeter(undefined);
// disable submit button
setSubmitButtonDisabled(true);
};
}; };
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => { let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {