From b415118cd5833f5f4ed0f62e4e4c0a44954222c7 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 28 Mar 2022 12:02:37 +0800 Subject: [PATCH 1/2] Modified Meter search and meter list problems --- myems-web/src/components/MyEMS/Meter/MeterCarbon.js | 3 +++ myems-web/src/components/MyEMS/Meter/MeterCost.js | 3 +++ myems-web/src/components/MyEMS/Meter/MeterEnergy.js | 3 +++ myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js | 3 +++ myems-web/src/components/MyEMS/Meter/MeterTrend.js | 3 +++ 5 files changed, 15 insertions(+) diff --git a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js index 6112133a..512c2caa 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js @@ -226,6 +226,9 @@ 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) ); diff --git a/myems-web/src/components/MyEMS/Meter/MeterCost.js b/myems-web/src/components/MyEMS/Meter/MeterCost.js index 7fd5c795..906812f0 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCost.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCost.js @@ -226,6 +226,9 @@ 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) ); diff --git a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js index f588885b..3e005f9d 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js @@ -228,6 +228,9 @@ 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) ); diff --git a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index f57fb968..598f706d 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -223,6 +223,9 @@ 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) ); diff --git a/myems-web/src/components/MyEMS/Meter/MeterTrend.js b/myems-web/src/components/MyEMS/Meter/MeterTrend.js index 127806b5..f7ae853d 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterTrend.js +++ b/myems-web/src/components/MyEMS/Meter/MeterTrend.js @@ -213,6 +213,9 @@ 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) ); From 407796ea2161c34a03de93c958acb0d0da1d317c Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Tue, 29 Mar 2022 10:06:38 +0800 Subject: [PATCH 2/2] Modified Meter search and meter list problems2 --- myems-web/src/components/MyEMS/Meter/MeterCarbon.js | 11 +++++++---- myems-web/src/components/MyEMS/Meter/MeterCost.js | 11 +++++++---- myems-web/src/components/MyEMS/Meter/MeterEnergy.js | 11 +++++++---- .../components/MyEMS/Meter/MeterSubmetersBalance.js | 11 +++++++---- myems-web/src/components/MyEMS/Meter/MeterTrend.js | 11 +++++++---- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js index 512c2caa..6d74548f 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js @@ -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 diff --git a/myems-web/src/components/MyEMS/Meter/MeterCost.js b/myems-web/src/components/MyEMS/Meter/MeterCost.js index 906812f0..3e16c8ea 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCost.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCost.js @@ -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 diff --git a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js index 3e005f9d..21332878 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js @@ -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 diff --git a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index 598f706d..d0a5e9b7 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -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 diff --git a/myems-web/src/components/MyEMS/Meter/MeterTrend.js b/myems-web/src/components/MyEMS/Meter/MeterTrend.js index f7ae853d..c851e3e4 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterTrend.js +++ b/myems-web/src/components/MyEMS/Meter/MeterTrend.js @@ -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