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

Pre Merge pull request !137 from tianlinzhong/develop

pull/137/MERGE
tianlinzhong 2022-03-29 14:42:43 +00:00 committed by Gitee
parent ccec8d98a2 407796ea21
commit 1c48edca08
5 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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
@ -229,7 +231,11 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
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

8
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
@ -229,7 +231,11 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
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

8
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
@ -231,7 +233,11 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
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

8
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
@ -226,7 +228,11 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
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

8
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
@ -216,7 +218,11 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
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