From 1141fa62f4ac145a5ff0c8822bbcee3a4a3e53ad Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Wed, 6 Apr 2022 17:11:51 +0800 Subject: [PATCH 1/3] resolve issue I4ZNLO --- myems-web/src/components/MyEMS/Meter/MeterTrend.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/myems-web/src/components/MyEMS/Meter/MeterTrend.js b/myems-web/src/components/MyEMS/Meter/MeterTrend.js index 127806b5..3e63a473 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterTrend.js +++ b/myems-web/src/components/MyEMS/Meter/MeterTrend.js @@ -226,6 +226,8 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => { // disable submit button setSubmitButtonDisabled(true); }; + let customInputTarget = document.getElementById("meterSelect"); + customInputTarget.value = filteredResult[0].value }; let onReportingPeriodChange = (DateRange) => { From 3bb4dada584e62c8f97c98c9e07b9fb6ca7e7238 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Thu, 7 Apr 2022 09:59:24 +0800 Subject: [PATCH 2/3] resolve issue I4ZNLO --- myems-web/src/components/MyEMS/Meter/MeterCarbon.js | 2 ++ myems-web/src/components/MyEMS/Meter/MeterCost.js | 2 ++ myems-web/src/components/MyEMS/Meter/MeterEnergy.js | 2 ++ myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js | 2 ++ myems-web/src/components/MyEMS/Meter/MeterTrend.js | 4 ++-- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js index 6112133a..aaea078d 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCarbon.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCarbon.js @@ -239,6 +239,8 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => { // disable submit button setSubmitButtonDisabled(true); }; + let customInputTarget = document.getElementById('meterSelect'); + customInputTarget.value = filteredResult[0].value; }; let onComparisonTypeChange = ({ target }) => { diff --git a/myems-web/src/components/MyEMS/Meter/MeterCost.js b/myems-web/src/components/MyEMS/Meter/MeterCost.js index 7fd5c795..6b09cfec 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterCost.js +++ b/myems-web/src/components/MyEMS/Meter/MeterCost.js @@ -239,6 +239,8 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => { // disable submit button setSubmitButtonDisabled(true); }; + let customInputTarget = document.getElementById('meterSelect'); + customInputTarget.value = filteredResult[0].value; }; let onComparisonTypeChange = ({ target }) => { diff --git a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js index f588885b..6b1ec6fe 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterEnergy.js +++ b/myems-web/src/components/MyEMS/Meter/MeterEnergy.js @@ -241,6 +241,8 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => { // disable submit button setSubmitButtonDisabled(true); }; + let customInputTarget = document.getElementById('meterSelect'); + customInputTarget.value = filteredResult[0].value; }; let onComparisonTypeChange = ({ target }) => { diff --git a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js index f57fb968..09f31582 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js +++ b/myems-web/src/components/MyEMS/Meter/MeterSubmetersBalance.js @@ -236,6 +236,8 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => { // disable submit button setSubmitButtonDisabled(true); }; + let customInputTarget = document.getElementById('meterSelect'); + customInputTarget.value = filteredResult[0].value; }; let onReportingPeriodChange = (DateRange) => { diff --git a/myems-web/src/components/MyEMS/Meter/MeterTrend.js b/myems-web/src/components/MyEMS/Meter/MeterTrend.js index 3e63a473..5bb5a7be 100644 --- a/myems-web/src/components/MyEMS/Meter/MeterTrend.js +++ b/myems-web/src/components/MyEMS/Meter/MeterTrend.js @@ -226,8 +226,8 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => { // disable submit button setSubmitButtonDisabled(true); }; - let customInputTarget = document.getElementById("meterSelect"); - customInputTarget.value = filteredResult[0].value + let customInputTarget = document.getElementById('meterSelect'); + customInputTarget.value = filteredResult[0].value; }; let onReportingPeriodChange = (DateRange) => { From 4ff1177ce754d58bb005430291df46441d879ea5 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 7 Apr 2022 17:43:11 +0800 Subject: [PATCH 3/3] fixed Meter list search and clear issue --- CHANGELOG.md | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3676846..752358a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added -- None. +- added myems_production_db to database. +- added column to `myems_production_db`.`tbl_teams` in database. +- added instruction for running myems-api with waitress on Windows. +- added nano to Dockfile. +- added telnet to Dockerfile. +- ### Changed -- None. +- renamed folder admin to myems-admin, and folder web to myems-web. +- updated nginx configs for myems-admin and myems-web. +- updated upload folder path. +- renamed index tbl_tariffs_index in database. +- replaced TRUE/FALSE with 1/0 in SQL statements in myems-cleaning service. +- replaced TRUE/FALSE with 1/0 in SQL statements in myems-normalization service. +- updated example.env for myems-normalization. +- replaced TRUE/FALSE with 1/0 in SQL statements in myems-aggregation service. +- replaced FALSE with 0 in SQL statements. +- changed linechart background color when web ui is in light mode. +- removed dictionary parameter from cursor in myems-cleaning service. +- removed dictionary parameter from cursor in myems-normalization service. +- updated database demo scripts. +- removed dictionary parameter from cursor of combinedequipment api functions. +- updated Dockerfile and README of Web UI. +- updated .env path for docker run in README. +- updated docker instruction in README. ### Fixed -- None. +- Fixed Meter list search and clear issue. +- moved cnx.close after cursor.close in useractivity.write_log procedure. +- fixed no such file error in admin ui. +- moved cursor.close before cnx.close in myems aggregation service. ### Removed - None.