- {t('Combined Equipment Data')}{t('Batch Analysis')}
+ {t('Combined Equipment Data')}
+ {t('Batch Analysis')}
@@ -322,10 +338,12 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
{t('Space')}
-
+ expandTrigger="hover"
+ >
@@ -333,8 +351,10 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
-
-
+
+
{
-
+
-
+
-
-
+
- {t('Export')}
-
+ onClick={handleExport}
+ >
+ {t('Export')}
+
-
-
-
+
);
};
-export default withTranslation()(withRedirect(CombinedEquipmentBatch));
+export default withTranslation()(withRedirect(CombinedEquipmentBatch));
\ No newline at end of file
From d73f723b50228b09986c2f944646d41b4b2ae429 Mon Sep 17 00:00:00 2001
From: nengyuanzhang <13011132526@163.com>
Date: Sat, 17 Feb 2024 17:51:03 +0800
Subject: [PATCH 2/2] fixed warnings in myems-web
---
.../components/MyEMS/AuxiliarySystem/DistributionSystem.js | 2 +-
.../src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentBatch.js | 4 ++--
.../MyEMS/CombinedEquipment/CombinedEquipmentCarbon.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentCost.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js | 2 +-
.../CombinedEquipment/CombinedEquipmentEnergyCategory.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentIncome.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentLoad.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentOutput.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentSaving.js | 2 +-
.../MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js | 2 +-
myems-web/src/components/MyEMS/Meter/MeterEnergy.js | 2 +-
myems-web/src/components/MyEMS/Meter/MeterRealtime.js | 4 ++--
myems-web/src/components/MyEMS/Meter/VirtualMeterCarbon.js | 2 +-
myems-web/src/components/MyEMS/Meter/VirtualMeterCost.js | 2 +-
.../src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js | 2 +-
myems-web/src/components/MyEMS/Space/SpaceEnergyCategory.js | 2 +-
.../src/components/MyEMS/Space/SpaceEnvironmentMonitor.js | 4 ++--
myems-web/src/components/MyEMS/Store/StoreEnergyCategory.js | 2 +-
myems-web/src/components/MyEMS/Tenant/TenantEnergyCategory.js | 2 +-
myems-web/src/components/MyEMS/auth/ChangePasswordForm.js | 2 +-
.../MyEMS/auth/SentForgotPasswordEmailMessageForm.js | 4 ++--
.../src/components/MyEMS/auth/SentRegisterEmailMessageForm.js | 4 ++--
myems-web/src/components/MyEMS/common/AMap.js | 2 +-
myems-web/src/components/MyEMS/common/BarChart.js | 2 +-
myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js | 2 +-
myems-web/src/components/MyEMS/common/CustomizeMapBox.js | 4 ++--
myems-web/src/components/MyEMS/common/LineChart.js | 2 +-
myems-web/src/components/MyEMS/common/MixedLineChart.js | 2 +-
myems-web/src/components/MyEMS/common/MultiTrendChart.js | 2 +-
myems-web/src/components/MyEMS/common/MultipleLineChart.js | 4 ++--
myems-web/src/components/MyEMS/common/dialog/charts.js | 2 +-
myems-web/src/components/navbar/NavbarVertical.js | 2 +-
35 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/myems-web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js b/myems-web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js
index 779bfda729..f0cd8db89c 100644
--- a/myems-web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js
+++ b/myems-web/src/components/MyEMS/AuxiliarySystem/DistributionSystem.js
@@ -117,7 +117,7 @@ const DistributionSystem = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, []);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js b/myems-web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
index b30866c80b..8969ebd46e 100644
--- a/myems-web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
+++ b/myems-web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
@@ -128,7 +128,7 @@ const EnergyFlowDiagram = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
index 8da9d0af6d..681a2122a9 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
@@ -152,7 +152,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
.catch(err => {
console.log(err);
});
- }, [t]);
+ }, []);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
@@ -410,4 +410,4 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
);
};
-export default withTranslation()(withRedirect(CombinedEquipmentBatch));
\ No newline at end of file
+export default withTranslation()(withRedirect(CombinedEquipmentBatch));
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCarbon.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCarbon.js
index 2d9594f300..c3fbd5eedb 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCarbon.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCarbon.js
@@ -214,7 +214,7 @@ const CombinedEquipmentCarbon = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js
index a9ebe0b7a8..a822e2f001 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCost.js
@@ -214,7 +214,7 @@ const CombinedEquipmentCost = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
index 3fc1926396..bd5bf78d56 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEfficiency.js
@@ -211,7 +211,7 @@ const CombinedEquipmentEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js
index 1fb7041f31..6c14b55fa7 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyCategory.js
@@ -241,7 +241,7 @@ const CombinedEquipmentEnergyCategory = ({ setRedirect, setRedirectUrl, t }) =>
'&language=' + language;
loadData(url);
}
- }, [basePeriodDateRange, language, periodType, reportingPeriodDateRange, t, uuid]);
+ }, []);
const loadData = (url) => {
// disable submit button
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js
index e8b5c5f795..cdb97b1f5a 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentEnergyItem.js
@@ -212,7 +212,7 @@ const CombinedEquipmentEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, []);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js
index 93c1e6bf1f..47b9897b84 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentIncome.js
@@ -213,7 +213,7 @@ const CombinedEquipmentIncome = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, []);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js
index faec83e385..80eb175ccc 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentLoad.js
@@ -208,7 +208,7 @@ const CombinedEquipmentLoad = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, []);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
index c23e30edf9..87a9d78aec 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentOutput.js
@@ -210,7 +210,7 @@ const CombinedEquipmentOutput = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js
index 902078ec04..a0c28176ec 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentSaving.js
@@ -216,7 +216,7 @@ const CombinedEquipmentSaving = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, []);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js
index ace941fb14..f781ff28d4 100644
--- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js
+++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentStatistics.js
@@ -210,7 +210,7 @@ const CombinedEquipmentStatistics = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js
index 62b902bb89..11acfe12f3 100644
--- a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js
+++ b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js
@@ -214,7 +214,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t}) => {
'&language=' + language;
loadData(url);
}
- }, [t, basePeriodDateRange, language, periodType, reportingPeriodDateRange, uuid]);
+ }, []);
const loadData = (url) => {
// disable submit button
diff --git a/myems-web/src/components/MyEMS/Meter/MeterRealtime.js b/myems-web/src/components/MyEMS/Meter/MeterRealtime.js
index 5252969a4a..4562d54c53 100644
--- a/myems-web/src/components/MyEMS/Meter/MeterRealtime.js
+++ b/myems-web/src/components/MyEMS/Meter/MeterRealtime.js
@@ -215,13 +215,13 @@ const MeterRealtime = ({ setRedirect, setRedirectUrl, t }) => {
document.getElementById("cursor_4").hidden=false;
}
- }, [meterList]);
+ }, []);
useEffect(() => {
setSelectMeterList(meterList.slice(cursor * len - 8, cursor * len));
- }, [cursor, meterList]);
+ }, []);
function getCursor(location){
switch (location){
diff --git a/myems-web/src/components/MyEMS/Meter/VirtualMeterCarbon.js b/myems-web/src/components/MyEMS/Meter/VirtualMeterCarbon.js
index 9434658a04..9de28840e1 100644
--- a/myems-web/src/components/MyEMS/Meter/VirtualMeterCarbon.js
+++ b/myems-web/src/components/MyEMS/Meter/VirtualMeterCarbon.js
@@ -202,7 +202,7 @@ const VirtualMeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
}).catch(err => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/Meter/VirtualMeterCost.js b/myems-web/src/components/MyEMS/Meter/VirtualMeterCost.js
index d621c4c3ca..873de7148a 100644
--- a/myems-web/src/components/MyEMS/Meter/VirtualMeterCost.js
+++ b/myems-web/src/components/MyEMS/Meter/VirtualMeterCost.js
@@ -203,7 +203,7 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
console.log(err);
});
- }, [t, ]);
+ }, [ ]);
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
diff --git a/myems-web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js b/myems-web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js
index 268ee8e621..b7d0f11b5f 100644
--- a/myems-web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js
+++ b/myems-web/src/components/MyEMS/Shopfloor/ShopfloorEnergyCategory.js
@@ -229,7 +229,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
'&language=' + language;
loadData(url);
}
- }, [basePeriodDateRange, language, periodType, reportingPeriodDateRange, t, uuid]);
+ }, []);
const loadData = (url) => {
// disable submit button
diff --git a/myems-web/src/components/MyEMS/Space/SpaceEnergyCategory.js b/myems-web/src/components/MyEMS/Space/SpaceEnergyCategory.js
index 1d9ca90428..961f43b2fd 100644
--- a/myems-web/src/components/MyEMS/Space/SpaceEnergyCategory.js
+++ b/myems-web/src/components/MyEMS/Space/SpaceEnergyCategory.js
@@ -183,7 +183,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
}).catch(err => {
console.log(err);
});
- }, [loadUUID, t]);
+ }, [t]);
const spaceName = (spaceList, spaceID, name, ids) => {
let newName = name;
diff --git a/myems-web/src/components/MyEMS/Space/SpaceEnvironmentMonitor.js b/myems-web/src/components/MyEMS/Space/SpaceEnvironmentMonitor.js
index 5b2c337c28..ec4ca4afda 100644
--- a/myems-web/src/components/MyEMS/Space/SpaceEnvironmentMonitor.js
+++ b/myems-web/src/components/MyEMS/Space/SpaceEnvironmentMonitor.js
@@ -205,11 +205,11 @@ const SpaceEnvironmentMonitor = ({ setRedirect, setRedirectUrl, t }) => {
document.getElementById("cursor_4").hidden=false;
}
- }, [sensorList]);
+ }, []);
useEffect(() => {
setSelectSensorList(sensorList.slice(cursor * len - 8, cursor * len));
- }, [cursor, sensorList]);
+ }, []);
function getCursor(location){
switch (location){
diff --git a/myems-web/src/components/MyEMS/Store/StoreEnergyCategory.js b/myems-web/src/components/MyEMS/Store/StoreEnergyCategory.js
index 7e9f77a476..9c07f864c1 100644
--- a/myems-web/src/components/MyEMS/Store/StoreEnergyCategory.js
+++ b/myems-web/src/components/MyEMS/Store/StoreEnergyCategory.js
@@ -230,7 +230,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
'&language=' + language;
loadData(url);
}
- }, [basePeriodDateRange, language, periodType, reportingPeriodDateRange, t, uuid]);
+ }, []);
const loadData = (url) => {
// disable submit button
diff --git a/myems-web/src/components/MyEMS/Tenant/TenantEnergyCategory.js b/myems-web/src/components/MyEMS/Tenant/TenantEnergyCategory.js
index 94c093ec9d..d59f2aab2a 100644
--- a/myems-web/src/components/MyEMS/Tenant/TenantEnergyCategory.js
+++ b/myems-web/src/components/MyEMS/Tenant/TenantEnergyCategory.js
@@ -230,7 +230,7 @@ const TenantEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
'&language=' + language;
loadData(url);
}
- }, [basePeriodDateRange, language, periodType, reportingPeriodDateRange, t, uuid]);
+ }, []);
const loadData = (url) => {
// disable submit button
diff --git a/myems-web/src/components/MyEMS/auth/ChangePasswordForm.js b/myems-web/src/components/MyEMS/auth/ChangePasswordForm.js
index e5a7b46975..06eda261fd 100644
--- a/myems-web/src/components/MyEMS/auth/ChangePasswordForm.js
+++ b/myems-web/src/components/MyEMS/auth/ChangePasswordForm.js
@@ -53,7 +53,7 @@ const ChangePasswordForm = ({ setRedirect, setRedirectUrl, layout, t }) => {
if (oldPassword === '' || newPassword === '' || confirmPassword === '') return setIsDisabled(true);
setIsDisabled(newPassword !== confirmPassword);
- }, [oldPassword, newPassword, confirmPassword]);
+ }, []);
const handleSubmit = e => {
e.preventDefault();
diff --git a/myems-web/src/components/MyEMS/auth/SentForgotPasswordEmailMessageForm.js b/myems-web/src/components/MyEMS/auth/SentForgotPasswordEmailMessageForm.js
index 306dce6c1a..6060f0cb4e 100644
--- a/myems-web/src/components/MyEMS/auth/SentForgotPasswordEmailMessageForm.js
+++ b/myems-web/src/components/MyEMS/auth/SentForgotPasswordEmailMessageForm.js
@@ -154,7 +154,7 @@ const SentForgotPasswordEmailMessageForm = ({ setRedirect, setRedirectUrl, hasLa
useEffect(() => {
setIsSubmitDisabled(!email || !password || !code);
- }, [email, password, code]);
+ }, []);
const toggleVisibility = () => {
setInputType(inputType === 'password' ? 'text' : 'password');
@@ -163,7 +163,7 @@ const SentForgotPasswordEmailMessageForm = ({ setRedirect, setRedirectUrl, hasLa
useEffect(() => {
setItemToStore('email', email);
// eslint-disable-next-line
- }, [email]);
+ }, []);
return (