diff --git a/CHANGELOG.md b/CHANGELOG.md index bce0e22e..0ae71c05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. +## [v1.3.3] - 2021-10-30 +### Added +- added missing rule_id in myems_fdd_db. + +### Changed +- updated package.json in web ui +- updated README and database test procedure +- added validation of offline meter hourly values to myems-normalization service +- updated offline meter data template file +- added new period type 'weekly' to meterenergy and aggregate_hourly_data_by_period in API +- updated comments in aggregate_hourly_data_by_period of API +- updated myems-api installation. + +### Fixed +- fixed NoneType error in myems-cleaning service +- fixed warnings in myems-aggregation service +- fixed detailed data sort issues in Web UI + +### Removed +- removed duplicate entry in i18n of Web UI +- removed unused import from API. + ## [v1.3.2] - 2021-10-22 ### Added - added associated equipments data to combinedequipmentefficiency report. @@ -504,7 +526,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. -[Unreleased]: https://github.com/MyEMS/myems/compare/v1.3.2...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.3.3...HEAD +[v1.3.3]: https://github.com/MyEMS/myems/compare/v1.3.2...v1.3.3 [v1.3.2]: https://github.com/MyEMS/myems/compare/v1.3.1...v1.3.2 [v1.3.1]: https://github.com/MyEMS/myems/compare/v1.3.0...v1.3.1 [v1.3.0]: https://github.com/MyEMS/myems/compare/v1.2.3...v1.3.0 diff --git a/README.md b/README.md index 301456fe..4a65309b 100644 --- a/README.md +++ b/README.md @@ -175,16 +175,17 @@ sed -i 's/127.0.0.1/192.168.0.2/g' myems-normalization/.env **3.3** 测试数据库是否可以正确连接 ``` -python3 myems/database/test_mysql.py +cd myems +python3 myems-api/test_mysql.py ``` -注:如果测试通过,继续下一步操作,否则请修改.env配置,确保数据库可以通过Python3正常连接访问。 +注:如果测试通过,继续下一步操作,否则请修改.env配置。 -- 4.web打包 (myems/web为React项目,需要打包为产品文件) +- 4.web打包 (Web UI 为React项目,需要打包为产品文件) ``` cd myems/web -npm install +npm install npm run build ``` @@ -197,7 +198,6 @@ docker-compose up -d ``` - - 6.测试 diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index 8406c030..61a00643 100644 --- a/admin/views/common/footer-login.html +++ b/admin/views/common/footer-login.html @@ -1,5 +1,5 @@
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html index c8efa71d..4b4879b0 100644 --- a/admin/views/common/footer.html +++ b/admin/views/common/footer.html @@ -3,6 +3,6 @@ https://myems.io`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Duplicate behavior to the data-* attribute for our tooltip plugin\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Remove the bottom border in Firefox 39-.\n// 5. Prevent the text-decoration to be skipped.\n\nabbr[title],\nabbr[data-original-title] { // 1\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 4\n text-decoration-skip-ink: none; // 5\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\nb,\nstrong {\n font-weight: $font-weight-bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n\nsmall {\n @include font-size(80%); // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n @include font-size(75%);\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n\n @include hover() {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([class]) {\n color: inherit;\n text-decoration: none;\n\n @include hover() {\n color: inherit;\n text-decoration: none;\n }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-monospace;\n @include font-size(1em); // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n // Disable auto-hiding scrollbar in IE & legacy Edge to avoid overlap,\n // making it impossible to interact with the content\n -ms-overflow-style: scrollbar;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n // Workaround for the SVG overflow bug in IE10/11 is still required.\n // See https://github.com/twbs/bootstrap/issues/26878\n overflow: hidden;\n vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $table-caption-color;\n text-align: left;\n caption-side: bottom;\n}\n\n// 1. Removes font-weight bold by inheriting\n// 2. Matches default `