From 9316aaf2d314b2a3b766898aa2b06b2306871aab Mon Sep 17 00:00:00 2001 From: llis <2227043858@qq.com> Date: Sat, 17 Feb 2024 15:54:25 +0800 Subject: [PATCH 1/2] Fixed the warning message in the CombinedEquipmentBatch.js file --- .../CombinedEquipmentBatch.js | 321 ++++++++++-------- 1 file changed, 175 insertions(+), 146 deletions(-) diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js index dfaa1fb1ce..8da9d0af6d 100644 --- a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js +++ b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js @@ -12,7 +12,8 @@ import { FormGroup, Input, Label, - Spinner, Media + Spinner, + Media } from 'reactstrap'; import moment from 'moment'; import loadable from '@loadable/component'; @@ -24,14 +25,13 @@ import { toast } from 'react-toastify'; import ButtonIcon from '../../common/ButtonIcon'; import { APIBaseURL, settings } from '../../../config'; import DateRangePickerWrapper from '../common/DateRangePickerWrapper'; -import { endOfDay} from 'date-fns'; -import Appcontext from '../../../context/Context' -import {Link} from "react-router-dom"; -import Flex from "../../common/Flex"; +import { endOfDay } from 'date-fns'; +import Appcontext from '../../../context/Context'; +import { Link } from 'react-router-dom'; +import Flex from '../../common/Flex'; const DetailedDataTable = loadable(() => import('../common/DetailedDataTable')); - const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { let current_moment = moment(); useEffect(() => { @@ -40,7 +40,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { let user_display_name = getCookieValue('user_display_name'); let user_uuid = getCookieValue('user_uuid'); let token = getCookieValue('token'); - if (checkEmpty(is_logged_in) || checkEmpty(token)|| checkEmpty(user_uuid) || !is_logged_in) { + if (checkEmpty(is_logged_in) || checkEmpty(token) || checkEmpty(user_uuid) || !is_logged_in) { setRedirectUrl(`/authentication/basic/login`); setRedirect(true); } else { @@ -64,14 +64,19 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { return () => clearInterval(timer); }, [setRedirectUrl, setRedirect]); - // State // Query Parameters const [selectedSpaceName, setSelectedSpaceName] = useState(undefined); const [selectedSpaceID, setSelectedSpaceID] = useState(undefined); const [combinedEquipmentList, setCombinedEquipmentList] = useState([]); const [cascaderOptions, setCascaderOptions] = useState(undefined); - const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]); + const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([ + current_moment + .clone() + .startOf('month') + .toDate(), + current_moment.toDate() + ]); const dateRangePickerLocale = { sunday: t('sunday'), monday: t('monday'), @@ -89,7 +94,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { last7Days: t('last7Days'), formattedMonthPattern: 'yyyy-MM-dd' }; - const dateRangePickerStyle = { display: 'block', zIndex: 10}; + const dateRangePickerStyle = { display: 'block', zIndex: 10 }; const { language } = useContext(Appcontext); // buttons @@ -98,49 +103,56 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { const [exportButtonHidden, setExportButtonHidden] = useState(true); //Results - const [detailedDataTableColumns, setDetailedDataTableColumns] = useState( - [{dataField: 'name', text: t('Name'), sort: true}, {dataField: 'space', text: t('Space'), sort: true}]); + const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([ + { dataField: 'name', text: t('Name'), sort: true }, + { dataField: 'space', text: t('Space'), sort: true } + ]); const [excelBytesBase64, setExcelBytesBase64] = useState(undefined); useEffect(() => { let isResponseOK = false; - fetch( - APIBaseURL + - '/spaces/tree', { + fetch(APIBaseURL + '/spaces/tree', { method: 'GET', headers: { 'Content-type': 'application/json', 'User-UUID': getCookieValue('user_uuid'), - 'Token': getCookieValue('token') + Token: getCookieValue('token') }, - body: null, + body: null + }) + .then(response => { + console.log(response); + if (response.ok) { + isResponseOK = true; + } + return response.json(); + }) + .then(json => { + console.log(json); + if (isResponseOK) { + // rename keys + json = JSON.parse( + JSON.stringify([json]) + .split('"id":') + .join('"value":') + .split('"name":') + .join('"label":') + ); + setCascaderOptions(json); + // set the default selected space + setSelectedSpaceName([json[0]].map(o => o.label)); + setSelectedSpaceID([json[0]].map(o => o.value)); - }).then(response => { - console.log(response); - if (response.ok) { - isResponseOK = true; - } - return response.json(); - }).then(json => { - console.log(json); - if (isResponseOK) { - // rename keys - json = JSON.parse(JSON.stringify([json]).split('"id":').join('"value":').split('"name":').join('"label":')); - setCascaderOptions(json); - // set the default selected space - setSelectedSpaceName([json[0]].map(o => o.label)); - setSelectedSpaceID([json[0]].map(o => o.value)); - - setSubmitButtonDisabled(false); - setSpinnerHidden(true); - } else { - toast.error(t(json.description)); - } - }).catch(err => { - console.log(err); - }); - - }, []); + setSubmitButtonDisabled(false); + setSpinnerHidden(true); + } else { + toast.error(t(json.description)); + } + }) + .catch(err => { + console.log(err); + }); + }, [t]); const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0'; @@ -153,11 +165,11 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { }; // Callback fired when value changed - let onReportingPeriodChange = (DateRange) => { - if(DateRange == null) { + let onReportingPeriodChange = DateRange => { + if (DateRange == null) { setReportingPeriodDateRange([null, null]); } else { - if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') { + if (moment(DateRange[1]).format('HH:mm:ss') === '00:00:00') { // if the user did not change time value, set the default time to the end of day DateRange[1] = endOfDay(DateRange[1]); } @@ -175,7 +187,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { e.preventDefault(); console.log('handleSubmit'); console.log(selectedSpaceID); - console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss')) + console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss')); console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss')); // disable submit button @@ -199,104 +211,107 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => { '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') + '&language=' + - language, { - method: 'GET', - headers: { - 'Content-type': 'application/json', - 'User-UUID': getCookieValue('user_uuid'), - 'Token': getCookieValue('token') - }, - body: null, - - }).then(response => { - if (response.ok) { - isResponseOK = true; - }; - return response.json(); - }).then(json => { - if (isResponseOK) { - console.log(json) - let detailed_column_list = []; - detailed_column_list.push({ - dataField: 'name', - text: t('Name'), - formatter: nameFormatter, - sort: true - }); - detailed_column_list.push({ - dataField: 'space', - text: t('Space'), - sort: true - }); - json['energycategories'].forEach((currentValue, index) => { + language, + { + method: 'GET', + headers: { + 'Content-type': 'application/json', + 'User-UUID': getCookieValue('user_uuid'), + Token: getCookieValue('token') + }, + body: null + } + ) + .then(response => { + if (response.ok) { + isResponseOK = true; + } + return response.json(); + }) + .then(json => { + if (isResponseOK) { + console.log(json); + let detailed_column_list = []; + detailed_column_list.push({ + dataField: 'name', + text: t('Name'), + formatter: nameFormatter, + sort: true + }); detailed_column_list.push({ - dataField: 'a' + index, - text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', - sort: true, - formatter: function (decimalValue) { - if (typeof decimalValue === 'number') { - return decimalValue.toFixed(2); - } else { - return null; + dataField: 'space', + text: t('Space'), + sort: true + }); + json['energycategories'].forEach((currentValue, index) => { + detailed_column_list.push({ + dataField: 'a' + index, + text: currentValue['name'] + ' (' + currentValue['unit_of_measure'] + ')', + sort: true, + formatter: function(decimalValue) { + if (typeof decimalValue === 'number') { + return decimalValue.toFixed(2); + } else { + return null; + } } - } - }) - }); - setDetailedDataTableColumns(detailed_column_list); - let combined_equipments = []; - if (json['combined_equipments'].length > 0) { - json['combined_equipments'].forEach((currentCombinedEquipment, index) => { - let detailed_value = {}; - detailed_value['id'] = currentCombinedEquipment['id']; - detailed_value['name'] = currentCombinedEquipment['combined_equipment_name']; - detailed_value['uuid'] = currentCombinedEquipment['combined_equipment_uuid']; - detailed_value['space'] = currentCombinedEquipment['space_name']; - detailed_value['costcenter'] = currentCombinedEquipment['cost_center_name']; - currentCombinedEquipment['values'].forEach((currentValue, energyCategoryIndex) => { - detailed_value['a' + energyCategoryIndex] = currentValue }); - combined_equipments.push(detailed_value); }); - }; - - setCombinedEquipmentList(combined_equipments); + setDetailedDataTableColumns(detailed_column_list); + let combined_equipments = []; + if (json['combined_equipments'].length > 0) { + json['combined_equipments'].forEach((currentCombinedEquipment, index) => { + let detailed_value = {}; + detailed_value['id'] = currentCombinedEquipment['id']; + detailed_value['name'] = currentCombinedEquipment['combined_equipment_name']; + detailed_value['uuid'] = currentCombinedEquipment['combined_equipment_uuid']; + detailed_value['space'] = currentCombinedEquipment['space_name']; + detailed_value['costcenter'] = currentCombinedEquipment['cost_center_name']; + currentCombinedEquipment['values'].forEach((currentValue, energyCategoryIndex) => { + detailed_value['a' + energyCategoryIndex] = currentValue; + }); + combined_equipments.push(detailed_value); + }); + } - setExcelBytesBase64(json['excel_bytes_base64']); + setCombinedEquipmentList(combined_equipments); - // enable submit button - setSubmitButtonDisabled(false); - // hide spinner - setSpinnerHidden(true); - // show export button - setExportButtonHidden(false); + setExcelBytesBase64(json['excel_bytes_base64']); - } else { - toast.error(t(json.description)) - } - }).catch(err => { - console.log(err); - }); + // enable submit button + setSubmitButtonDisabled(false); + // hide spinner + setSpinnerHidden(true); + // show export button + setExportButtonHidden(false); + } else { + toast.error(t(json.description)); + } + }) + .catch(err => { + console.log(err); + }); }; const handleExport = e => { e.preventDefault(); - const mimeType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' - const fileName = 'combinedequipmentbatch.xlsx' - var fileUrl = "data:" + mimeType + ";base64," + excelBytesBase64; + const mimeType = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; + const fileName = 'combinedequipmentbatch.xlsx'; + var fileUrl = 'data:' + mimeType + ';base64,' + excelBytesBase64; fetch(fileUrl) - .then(response => response.blob()) - .then(blob => { - var link = window.document.createElement('a'); - link.href = window.URL.createObjectURL(blob, { type: mimeType }); - link.download = fileName; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - }); + .then(response => response.blob()) + .then(blob => { + var link = window.document.createElement('a'); + link.href = window.URL.createObjectURL(blob, { type: mimeType }); + link.download = fileName; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + }); }; const nameFormatter = (dataField, { name, uuid }) => ( - + {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 }) => { - -
+ +
{
- +

-
-
- + + 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 (
diff --git a/myems-web/src/components/MyEMS/auth/SentRegisterEmailMessageForm.js b/myems-web/src/components/MyEMS/auth/SentRegisterEmailMessageForm.js index 260f9cc44c..54dc9185da 100644 --- a/myems-web/src/components/MyEMS/auth/SentRegisterEmailMessageForm.js +++ b/myems-web/src/components/MyEMS/auth/SentRegisterEmailMessageForm.js @@ -154,12 +154,12 @@ const SentRegisterEmailMessageForm = ({ setRedirect, setRedirectUrl, hasLabel, l useEffect(() => { setItemToStore('email', email); // eslint-disable-next-line - }, [email]); + }, []); useEffect(() => { setIsSubmitDisabled(!email || !password || !displayName || !name || !code); - }, [email, password, displayName, name, code]); + }, []); const toggleVisibility = () => { setInputType(inputType === 'password' ? 'text' : 'password'); diff --git a/myems-web/src/components/MyEMS/common/AMap.js b/myems-web/src/components/MyEMS/common/AMap.js index e797542100..bbd5224cc2 100644 --- a/myems-web/src/components/MyEMS/common/AMap.js +++ b/myems-web/src/components/MyEMS/common/AMap.js @@ -50,7 +50,7 @@ const CustomizeMap = ({Latitude, Longitude, Zoom,t}) => { .catch(e => { console.log(e); }); - }, [t, Latitude, Longitude, zoom]); + }, []); return ( // Initialize map container, use div tag as the map container, and assign an id attribute to the div diff --git a/myems-web/src/components/MyEMS/common/BarChart.js b/myems-web/src/components/MyEMS/common/BarChart.js index 1d5d707f44..e4b239983a 100644 --- a/myems-web/src/components/MyEMS/common/BarChart.js +++ b/myems-web/src/components/MyEMS/common/BarChart.js @@ -84,7 +84,7 @@ const BarChart = ({ datasets: datasets }); } - }, [data, compareData, compareTitle, isDark, labels, title]); + }, []); const config = { options: { diff --git a/myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js b/myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js index 9cf902f392..92489a3f3a 100644 --- a/myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js +++ b/myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js @@ -76,7 +76,7 @@ const ChartSpacesStackBar = ({ labels, inputData, costData, title, childSpaces, datasets: dataArray }) } - }, [labels, inputData, costData, option, colors, isDark, t]) + }, []) const options = { scales: { x: { diff --git a/myems-web/src/components/MyEMS/common/CustomizeMapBox.js b/myems-web/src/components/MyEMS/common/CustomizeMapBox.js index ba0a0a8dd5..864a4bef1c 100644 --- a/myems-web/src/components/MyEMS/common/CustomizeMapBox.js +++ b/myems-web/src/components/MyEMS/common/CustomizeMapBox.js @@ -50,7 +50,7 @@ const CustomizeMapBox = ({Latitude, Longitude, Zoom, Geojson, t}) => { map.current.addControl(mapboxLanguage); - }, [t, Latitude, Longitude, Zoom, isDark, language, lat, lng, zoom]); + }, []); useEffect(() => { var lang = language; @@ -192,7 +192,7 @@ const CustomizeMapBox = ({Latitude, Longitude, Zoom, Geojson, t}) => { }); }); } - }, [language, Geojson, Latitude, Longitude, Zoom, isDark, lat, lng, zoom]) + }, []) return (
diff --git a/myems-web/src/components/MyEMS/common/LineChart.js b/myems-web/src/components/MyEMS/common/LineChart.js index 1ef50fcc44..6e247c46ed 100644 --- a/myems-web/src/components/MyEMS/common/LineChart.js +++ b/myems-web/src/components/MyEMS/common/LineChart.js @@ -58,7 +58,7 @@ const LineChart = ({ }; setLineData(chartData); } - }, [data, option, labels, isDark, selectedLabel]); + }, []); const config = { options: { diff --git a/myems-web/src/components/MyEMS/common/MixedLineChart.js b/myems-web/src/components/MyEMS/common/MixedLineChart.js index d339227a54..c46d15e88d 100644 --- a/myems-web/src/components/MyEMS/common/MixedLineChart.js +++ b/myems-web/src/components/MyEMS/common/MixedLineChart.js @@ -93,7 +93,7 @@ const MixedLineChart = ({ }; setLineData(chartData); } - }, [data, option, labels, options]); + }, []); const config = { options: { diff --git a/myems-web/src/components/MyEMS/common/MultiTrendChart.js b/myems-web/src/components/MyEMS/common/MultiTrendChart.js index 3ee2955d93..7ee97a1a78 100644 --- a/myems-web/src/components/MyEMS/common/MultiTrendChart.js +++ b/myems-web/src/components/MyEMS/common/MultiTrendChart.js @@ -111,7 +111,7 @@ const MultiTrendChart = ({ }; setLineData(chartData); } - }, [baseData, reportingData, option, baseLabels, reportingLabels, rates, isDark]); + }, []); const config = { plugins: [ChartDataLabels], diff --git a/myems-web/src/components/MyEMS/common/MultipleLineChart.js b/myems-web/src/components/MyEMS/common/MultipleLineChart.js index bc1a0c6a0b..35f1709452 100644 --- a/myems-web/src/components/MyEMS/common/MultipleLineChart.js +++ b/myems-web/src/components/MyEMS/common/MultipleLineChart.js @@ -134,7 +134,7 @@ const MultipleLineChart = ({ setLinaLabels(labels[values[0]]); setValues(['a0']); setOldValues(['a0']) - }, [data, labels, options, colors, isDark, nodes, values]); + }, []); useEffect(() => { let tempNodes = [...nodes]; @@ -195,7 +195,7 @@ const MultipleLineChart = ({ } setNodes(tempNodes); setLinaLabels(labels[values[0]]); - }, [lastMoment, colors, data, isDark, labels, nodes, oldValues, options, values]); + }, []); let getOption = () => { return { diff --git a/myems-web/src/components/MyEMS/common/dialog/charts.js b/myems-web/src/components/MyEMS/common/dialog/charts.js index b100d61e19..1ceb75b7d9 100644 --- a/myems-web/src/components/MyEMS/common/dialog/charts.js +++ b/myems-web/src/components/MyEMS/common/dialog/charts.js @@ -75,7 +75,7 @@ export const Charts = (props) => { const chart = echarts.init(document.getElementById(id)); chart.clear(); chart.setOption(option); - }, [optionData, namewithid, pointname]) + }, []) return (
diff --git a/myems-web/src/components/navbar/NavbarVertical.js b/myems-web/src/components/navbar/NavbarVertical.js index a10bbb26d0..34608adf4d 100644 --- a/myems-web/src/components/navbar/NavbarVertical.js +++ b/myems-web/src/components/navbar/NavbarVertical.js @@ -81,7 +81,7 @@ const NavbarVertical = ({ setRedirectUrl, setRedirect, navbarStyle, t }) => { return () => { HTMLClassList.remove('navbar-vertical-collapsed-hover'); }; - }, [isNavbarVerticalCollapsed, HTMLClassList]); + }, []); //Control mouseEnter event let time = null;