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

Modified Meter search and meter list problems2

pull/137/head
tianlinzhong 2022-03-29 10:06:38 +08:00
parent b415118cd5
commit 407796ea21
5 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
myems-web/src/components/MyEMS/Meter/MeterCarbon.js
View File

@ -61,6 +61,7 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
const [meterList, setMeterList] = useState([]);
const [startfilteredMeterList, setstartFilteredMeterList] = useState([]);
const [filteredMeterList, setFilteredMeterList] = useState([]);
const [selectedMeter, setSelectedMeter] = useState(undefined);
const [comparisonType, setComparisonType] = useState('month-on-month');
@ -156,6 +157,7 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
console.log(json);
setMeterList(json[0]);
setFilteredMeterList(json[0]);
setstartFilteredMeterList(json[0]);
if (json[0].length > 0) {
setSelectedMeter(json[0][0].value);
// enable submit button
@ -226,13 +228,14 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
const onSearchMeter = ({ target }) => {
const keyword = target.value.toLowerCase();
if (keyword.length == 0){
return false;
};
const filteredResult = meterList.filter(
meter => meter.label.toLowerCase().includes(keyword)
);
setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (keyword.length == 0){
setFilteredMeterList(startfilteredMeterList);
}else {
setFilteredMeterList(keyword.length ? filteredResult : meterList);
}
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button

11
myems-web/src/components/MyEMS/Meter/MeterCost.js
View File

@ -61,6 +61,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
const [meterList, setMeterList] = useState([]);
const [startfilteredMeterList, setstartFilteredMeterList] = useState([]);
const [filteredMeterList, setFilteredMeterList] = useState([]);
const [selectedMeter, setSelectedMeter] = useState(undefined);
const [comparisonType, setComparisonType] = useState('month-on-month');
@ -156,6 +157,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
console.log(json);
setMeterList(json[0]);
setFilteredMeterList(json[0]);
setstartFilteredMeterList(json[0]);
if (json[0].length > 0) {
setSelectedMeter(json[0][0].value);
// enable submit button
@ -226,13 +228,14 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
const onSearchMeter = ({ target }) => {
const keyword = target.value.toLowerCase();
if (keyword.length == 0){
return false;
};
const filteredResult = meterList.filter(
meter => meter.label.toLowerCase().includes(keyword)
);
setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (keyword.length == 0){
setFilteredMeterList(startfilteredMeterList);
}else {
setFilteredMeterList(keyword.length ? filteredResult : meterList);
}
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button

11
myems-web/src/components/MyEMS/Meter/MeterEnergy.js
View File

@ -61,6 +61,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
const [meterList, setMeterList] = useState([]);
const [startfilteredMeterList, setstartFilteredMeterList] = useState([]);
const [filteredMeterList, setFilteredMeterList] = useState([]);
const [selectedMeter, setSelectedMeter] = useState(undefined);
const [comparisonType, setComparisonType] = useState('month-on-month');
@ -156,6 +157,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
console.log(json);
setMeterList(json[0]);
setFilteredMeterList(json[0]);
setstartFilteredMeterList(json[0]);
if (json[0].length > 0) {
setSelectedMeter(json[0][0].value);
// enable submit button
@ -228,13 +230,14 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
const onSearchMeter = ({ target }) => {
const keyword = target.value.toLowerCase();
if (keyword.length == 0){
return false;
};
const filteredResult = meterList.filter(
meter => meter.label.toLowerCase().includes(keyword)
);
setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (keyword.length == 0){
setFilteredMeterList(startfilteredMeterList);
}else {
setFilteredMeterList(keyword.length ? filteredResult : meterList);
}
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button

11
myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js
View File

@ -59,6 +59,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
const [meterList, setMeterList] = useState([]);
const [startfilteredMeterList, setstartFilteredMeterList] = useState([]);
const [filteredMeterList, setFilteredMeterList] = useState([]);
const [selectedMeter, setSelectedMeter] = useState(undefined);
const [periodType, setPeriodType] = useState('daily');
@ -151,6 +152,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
console.log(json);
setMeterList(json[0]);
setFilteredMeterList(json[0]);
setstartFilteredMeterList(json[0]);
if (json[0].length > 0) {
setSelectedMeter(json[0][0].value);
// enable submit button
@ -223,13 +225,14 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
const onSearchMeter = ({ target }) => {
const keyword = target.value.toLowerCase();
if (keyword.length == 0){
return false;
};
const filteredResult = meterList.filter(
meter => meter.label.toLowerCase().includes(keyword)
);
setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (keyword.length == 0){
setFilteredMeterList(startfilteredMeterList);
}else {
setFilteredMeterList(keyword.length ? filteredResult : meterList);
}
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button

11
myems-web/src/components/MyEMS/Meter/MeterTrend.js
View File

@ -56,6 +56,7 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
const [meterList, setMeterList] = useState([]);
const [startfilteredMeterList, setstartFilteredMeterList] = useState([]);
const [filteredMeterList, setFilteredMeterList] = useState([]);
const [selectedMeter, setSelectedMeter] = useState(undefined);
const [cascaderOptions, setCascaderOptions] = useState(undefined);
@ -141,6 +142,7 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
console.log(json);
setMeterList(json[0]);
setFilteredMeterList(json[0]);
setstartFilteredMeterList(json[0]);
if (json[0].length > 0) {
setSelectedMeter(json[0][0].value);
// enable submit button
@ -213,13 +215,14 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
const onSearchMeter = ({ target }) => {
const keyword = target.value.toLowerCase();
if (keyword.length == 0){
return false;
};
const filteredResult = meterList.filter(
meter => meter.label.toLowerCase().includes(keyword)
);
setFilteredMeterList(keyword.length ? filteredResult : meterList);
if (keyword.length == 0){
setFilteredMeterList(startfilteredMeterList);
}else {
setFilteredMeterList(keyword.length ? filteredResult : meterList);
}
if (filteredResult.length > 0) {
setSelectedMeter(filteredResult[0].value);
// enable submit button