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

fixed issues of markdown in README files

pull/63/head
13621160019@163.com 2021-08-23 16:53:48 +08:00
parent 7766723f60
commit bbbc93acda
10 changed files with 707 additions and 713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

524
CHANGELOG.md
View File

@ -5,381 +5,381 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
### Added
- None.
- None.
### Changed
- None.
- None.
### Fixed
- None.
- None.
### Removed
- None.
- None.
## [v1.2.1] - 2021-08-19
## [v1.2.1] - 2021-08-19
### Added
- Added Missing Error Messages Words of API to Web UI i18n
- Added rule_id to messages tables of fdd database
- added version tags to images in Dockerfile
- Added Missing Error Messages Words of API to Web UI i18n
- Added rule_id to messages tables of fdd database
- added version tags to images in Dockerfile
### Changed
- renamed virtualmeter.model.html in Admin UI
- replaced stateChangeStart with transitions.onStart in Admin UI
- added filters for jstree action types of menu and space in Admin UI
- updated README of Web UI
- replaced href with ng-href in Admin UI
- upgraded Highcharts JS to v9.1.2
- upgraded jquery-ui to v1.12.1
- updated Admin UI translations for Error Messages of API
- upgraded ocLazyLoad to v1.0.10 in Admin UI
- updated Dockerfiles to add pip mirrors
- upgraded AngularJS to v1.8.2
- renamed virtualmeter.model.html in Admin UI
- replaced stateChangeStart with transitions.onStart in Admin UI
- added filters for jstree action types of menu and space in Admin UI
- updated README of Web UI
- replaced href with ng-href in Admin UI
- upgraded Highcharts JS to v9.1.2
- upgraded jquery-ui to v1.12.1
- updated Admin UI translations for Error Messages of API
- upgraded ocLazyLoad to v1.0.10 in Admin UI
- updated Dockerfiles to add pip mirrors
- upgraded AngularJS to v1.8.2
### Fixed
- removed unnecessary jc.jsextend library from Admin UI
- fixed debugging code issues in Admin UI
- fixed unused code issues in Admin UI
- fixed self assignment error in Web UI
- fixed 'Clear-text logging of sensitive information' in API
- fixed 'The variable binary_file_data does not seem to be defined for all execution paths' in API
- replaced == with === to avoid casting in Admin UI
- fixed response body of Restore actions
- fixed typos in database
- fixed typo in API
- fixed typo in demo data of database
- removed unnecessary jc.jsextend library from Admin UI
- fixed debugging code issues in Admin UI
- fixed unused code issues in Admin UI
- fixed self assignment error in Web UI
- fixed 'Clear-text logging of sensitive information' in API
- fixed 'The variable binary_file_data does not seem to be defined for all execution paths' in API
- replaced == with === to avoid casting in Admin UI
- fixed response body of Restore actions
- fixed typos in database
- fixed typo in API
- fixed typo in demo data of database
### Removed
- removed unused logs
- removed diff-match-patch library from Admin UI
- removed jeditable library from Admin UI
- removed js plugins codemirror and summernote from Admin UI
- removed 'unused import' from API
- removed uncessary pass from acquisition.py of myems-modbus-tcp
- removed unused import from meterbatch.py of API
- removed unnecessary library mathjax from Admin UI
- removed unnecessary libraries d3, and3, nvd3 and c3 from Admin UI
- removed unnecessary library nggrid from Admin UI
- removed unused logs
- removed diff-match-patch library from Admin UI
- removed jeditable library from Admin UI
- removed js plugins codemirror and summernote from Admin UI
- removed 'unused import' from API
- removed uncessary pass from acquisition.py of myems-modbus-tcp
- removed unused import from meterbatch.py of API
- removed unnecessary library mathjax from Admin UI
- removed unnecessary libraries d3, and3, nvd3 and c3 from Admin UI
- removed unnecessary library nggrid from Admin UI
## [v1.2.0] - 2021-08-08
## [v1.2.0] - 2021-08-08
### Added
- Added demo data to database
- Added demo data to database
### Changed
- Replaced every_day_* to periodic_* in excelexporters of API
- Updated Dockerfiles
- Replaced every_day_* to periodic_* in excelexporters of API
- Updated Dockerfiles
### Fixed
- Replaced every_day_* to periodic_* in excelexporters of API
- Fixed data issues of tbl_menus in database
- Replaced every_day_* to periodic_* in excelexporters of API
- Fixed data issues of tbl_menus in database
### Removed
- Deleted unnecessary words in translations of Admin UI
- Deleted unnecessary words in translations of Admin UI
## [v1.1.6] - 2021-08-02
## [v1.1.6] - 2021-08-02
### Added
- Added Meter Batch Analysis Report
- Added Child Space Share Pies for SpaceCost in Web UI
- Added Web UI & Admin UI Installation Guide on Apache Web Server
- Added Dockerfiles
- Added Customized Menus in Web UI, API and Admin UI
- Added Meter Batch Analysis Report
- Added Child Space Share Pies for SpaceCost in Web UI
- Added Web UI & Admin UI Installation Guide on Apache Web Server
- Added Dockerfiles
- Added Customized Menus in Web UI, API and Admin UI
### Changed
- None.
- None.
### Fixed
- Upgraded jquery to v2.2.4 in Admin UI
- Upgraded jquery to v2.2.4 in Admin UI
### Removed
- None.
- None.
## [v1.1.5] - 2021-07-20
## [v1.1.5] - 2021-07-20
### Added
- None.
- None.
### Changed
- changed all worksheet names of Excel exporters in API
- changed all worksheet names of Excel exporters in API
### Fixed
- updated upgrade1.1.4 sql
- fixed issue of gitignore in Admin UI
- updated upgrade1.1.4 sql
- fixed issue of gitignore in Admin UI
### Removed
- None.
- None.
## [v1.1.4] - 2021-07-19
## [v1.1.4] - 2021-07-19
### Added
- added tbl_email_messages to myems_reporting_db
- added data sort to FDD messages in Admin UI
- added new category to FDD rule in API & Admin UI
- added Search Input for meters in Web UI
- added last year data to dashboard
- added ChildSpaceProportion SharePies to Space Energy Category report of Web UI
- added ORDER BY utc_date_time to all digital parameters data in API
- added the pagination for meter realtime page
- added pagination to MeterRealtime in Web UI
- added internationalization of Vertical Navigation Bar in Web UI
- added Equipment Batch Analysis report API
- added Cost File to API and Admin UI
- added restore button to offline meter file in API and Admin UI
- added tbl_email_messages to myems_reporting_db
- added data sort to FDD messages in Admin UI
- added new category to FDD rule in API & Admin UI
- added Search Input for meters in Web UI
- added last year data to dashboard
- added ChildSpaceProportion SharePies to Space Energy Category report of Web UI
- added ORDER BY utc_date_time to all digital parameters data in API
- added the pagination for meter realtime page
- added pagination to MeterRealtime in Web UI
- added internationalization of Vertical Navigation Bar in Web UI
- added Equipment Batch Analysis report API
- added Cost File to API and Admin UI
- added restore button to offline meter file in API and Admin UI
### Changed
- changed GET Data Source Point Collection to order by ID
- changed equipment and combined equipment associated points name to parameters name in reports API
- updated validate expression of rule in API
- updated i18n in Web UI
- upgraded Web UI library to 2.10.2
- changed GET Data Source Point Collection to order by ID
- changed equipment and combined equipment associated points name to parameters name in reports API
- updated validate expression of rule in API
- updated i18n in Web UI
- upgraded Web UI library to 2.10.2
### Fixed
- fixed typo for deleting email messages in Admin UI
- fixed issues of deleting text message and wechat message in Admin UI
- fixed base period cost units issue of Dashboard API
- fixed selected meter issues in onSearchMeter of Web UI
- fixed wrong HTTP Status Code issues in API
- fixed Child Space Share Pie issue in excel exporter of spaceenergycategory
- fixed typo for deleting email messages in Admin UI
- fixed issues of deleting text message and wechat message in Admin UI
- fixed base period cost units issue of Dashboard API
- fixed selected meter issues in onSearchMeter of Web UI
- fixed wrong HTTP Status Code issues in API
- fixed Child Space Share Pie issue in excel exporter of spaceenergycategory
### Removed
- Drop table tbl_sms_recipients from myems_fdd_db
- deleted parameters data from Dashboard
- Drop table tbl_sms_recipients from myems_fdd_db
- deleted parameters data from Dashboard
## [v1.1.3] - 2021-05-25
## [v1.1.3] - 2021-05-25
### Added
- added Combined Equipment Batch Analysis Report
- added Shopfloor Batch Analysis Report
- added Store Batch Analysis Report
- added Tenant Batch Analysis Report
- implemented virtual point calculating in myems-normalization service
- added is_virtual to tbl_points in database
- added gateway process to myems-modbus-tcp service
- added gateway process to myems-bacnet service
- added procedure to update last seen datetime of data source in myems-modbus service
- added last seen datetime to data source setting in Admin UI
- added last seen datetime to Gateway Setting in Admin UI
- added excel exporter of spaceefficiency report in API
- added Combined Equipment Batch Analysis Report
- added Shopfloor Batch Analysis Report
- added Store Batch Analysis Report
- added Tenant Batch Analysis Report
- implemented virtual point calculating in myems-normalization service
- added is_virtual to tbl_points in database
- added gateway process to myems-modbus-tcp service
- added gateway process to myems-bacnet service
- added procedure to update last seen datetime of data source in myems-modbus service
- added last seen datetime to data source setting in Admin UI
- added last seen datetime to Gateway Setting in Admin UI
- added excel exporter of spaceefficiency report in API
### Changed
- updated Dashboard in web to display energy data of this year
- updated tbl_expressions in database
- added start value and end value to metertracking report
- updated comments and log messages in myems-modbust-tcp service
- improved theme of energyflowdiagram in Web UI
- updated Dashboard in web to display energy data of this year
- updated tbl_expressions in database
- added start value and end value to metertracking report
- updated comments and log messages in myems-modbust-tcp service
- improved theme of energyflowdiagram in Web UI
### Fixed
- updated metertracking report to reduce duplicated meters
- fixed detailed value missing issue in SpaceEfficiency report in Web UI
- updated metertracking report to reduce duplicated meters
- fixed detailed value missing issue in SpaceEfficiency report in Web UI
### Removed
- None.
- None.
## [v1.1.2] - 2021-04-23
## [v1.1.2] - 2021-04-23
### Added
- added associated parameters data to excel exporter of shopfloorstatistics in API
- added associated parameters data to excel exporter of shopfloorsaving in API
- added associated parameters data to excel exporter of shopfloorload in API
- added associated parameters data to excel exporter of shopfloorenergyitem in API
- added associated parameters data to excel exporter of shopfloorenergycategory in API
- added associated parameters data to excel exporter of shopfloorcost in API
- added associated parameters data to excel exporter of storestatistics in API
- added associated parameters data to excel exporter of storesaving in API
- added associated parameters data to excel exporter of storeload in API
- added associated parameters data to storeenergyitem in API
- added associated parameters data to excel exporter of storeenergycategory in API
- added associated parameters data to excel exporter of storecost in API
- added associated parameters data to excel exporter of spacestatistics in API
- added associated parameters data to excel exporter of spacesaving in API
- added associated parameters data to excel exporter of spaceoutput in API
- added associated parameters data to excel exporter of spaceload in API
- added associated parameters data to excel exporter of spaceincome in API
- added associated parameters data to excel exporter of spaceenergyitem in API
- added associated parameters data to excel exporter of spaceenergycategory in API
- added associated parameters data to excel export of spacecost in API
- added associated parameters data to excel exporter of metertrend in API
- added associated parameters data to excel exporter of meterenergy in API
- added associated parameters data to excel exporter of metersubmetersbalance in API
- added parameters data to excel exporter of metercost in API
- added associated parameters data to excel exporter of tenantstatistics in API
- added associated parameters data to excel exporter of tenantsaving in API
- added associated parameters data to excel exporter of tenantload in API
- added associated parameters data to excel exporter of tenantenergyitem in API
- added associated parameters data to excel exporter of tenantenergycategory in API
- added associated parameters data to excel exporter of tenantcost in API
- added associated parameters data to excel exporter of combinedequipmentstatistics in API
- added associated parameters data to combinedequipmentsaving in API
- added associated parameters data to combinedequipmentload in API
- added associated parameters data to combinedequipmentoutput in API
- added associated parameters data to combinedequipmentincome in API
- added associated parameters data to combinedequipmentenergyitem in API
- added associated parameters data to combinedequipmentenergycategory in API
- added associated parameters data to combinedequipmentcost in API
- added quickmode to HTTP request parameters of MeterTrend report in API
- added parameter data to excel exporter of EquipmentStatistics in API
- added parameter data to excel exporter of EquipmentSaving in API
- added parameter data to excel exporter of EquipmentOutput in API
- added parameter data to excel exporter of EquipmentLoad in API
- added parameters data to excel exporter of EquipmentEnergyItem in API
- added parameters data to excel exporter of EquipmentEnergyCategory in API
- added associated parameters data to excel exporter of shopfloorstatistics in API
- added associated parameters data to excel exporter of shopfloorsaving in API
- added associated parameters data to excel exporter of shopfloorload in API
- added associated parameters data to excel exporter of shopfloorenergyitem in API
- added associated parameters data to excel exporter of shopfloorenergycategory in API
- added associated parameters data to excel exporter of shopfloorcost in API
- added associated parameters data to excel exporter of storestatistics in API
- added associated parameters data to excel exporter of storesaving in API
- added associated parameters data to excel exporter of storeload in API
- added associated parameters data to storeenergyitem in API
- added associated parameters data to excel exporter of storeenergycategory in API
- added associated parameters data to excel exporter of storecost in API
- added associated parameters data to excel exporter of spacestatistics in API
- added associated parameters data to excel exporter of spacesaving in API
- added associated parameters data to excel exporter of spaceoutput in API
- added associated parameters data to excel exporter of spaceload in API
- added associated parameters data to excel exporter of spaceincome in API
- added associated parameters data to excel exporter of spaceenergyitem in API
- added associated parameters data to excel exporter of spaceenergycategory in API
- added associated parameters data to excel export of spacecost in API
- added associated parameters data to excel exporter of metertrend in API
- added associated parameters data to excel exporter of meterenergy in API
- added associated parameters data to excel exporter of metersubmetersbalance in API
- added parameters data to excel exporter of metercost in API
- added associated parameters data to excel exporter of tenantstatistics in API
- added associated parameters data to excel exporter of tenantsaving in API
- added associated parameters data to excel exporter of tenantload in API
- added associated parameters data to excel exporter of tenantenergyitem in API
- added associated parameters data to excel exporter of tenantenergycategory in API
- added associated parameters data to excel exporter of tenantcost in API
- added associated parameters data to excel exporter of combinedequipmentstatistics in API
- added associated parameters data to combinedequipmentsaving in API
- added associated parameters data to combinedequipmentload in API
- added associated parameters data to combinedequipmentoutput in API
- added associated parameters data to combinedequipmentincome in API
- added associated parameters data to combinedequipmentenergyitem in API
- added associated parameters data to combinedequipmentenergycategory in API
- added associated parameters data to combinedequipmentcost in API
- added quickmode to HTTP request parameters of MeterTrend report in API
- added parameter data to excel exporter of EquipmentStatistics in API
- added parameter data to excel exporter of EquipmentSaving in API
- added parameter data to excel exporter of EquipmentOutput in API
- added parameter data to excel exporter of EquipmentLoad in API
- added parameters data to excel exporter of EquipmentEnergyItem in API
- added parameters data to excel exporter of EquipmentEnergyCategory in API
### Changed
- updated README
- updated excel exporter of metersubmetersbalance in API
- updated excel exporter of meterenergy in API
- updated excel exporter of metercost in API
- updated panel width and height of costcenter in Admin UI
- updated panel width and height of combinedequipment view in Admin UI
- updated panel width and height of equipment view in Admin UI
- changed query form column width from auto to xs={6} sm={3} in Web UI
- updated README
- updated excel exporter of metersubmetersbalance in API
- updated excel exporter of meterenergy in API
- updated excel exporter of metercost in API
- updated panel width and height of costcenter in Admin UI
- updated panel width and height of combinedequipment view in Admin UI
- updated panel width and height of equipment view in Admin UI
- changed query form column width from auto to xs={6} sm={3} in Web UI
### Fixed
- fixed issues in excel exporters of combinedequipment in API
- added parameters validator to statistics_hourly_data_by_period in API
- added code to validate parameters of averaging_hourly_data_by_period in API
- fixed issue in excel exporter of equipmentincome in API
- fixed unit issue in CombinedEquipmentCost report in API
- fixed issues in excel exporters of combinedequipment in API
- added parameters validator to statistics_hourly_data_by_period in API
- added code to validate parameters of averaging_hourly_data_by_period in API
- fixed issue in excel exporter of equipmentincome in API
- fixed unit issue in CombinedEquipmentCost report in API
### Removed
- deleted slim-scroll from and added maxheight to panel of views in Admin UI
- deleted slim-scroll from and added maxheight to panel of views in Admin UI
## [v1.1.1] - 2021-03-31
## [v1.1.1] - 2021-03-31
### Added
- added associated equipment data to CombinedEquipmentCost report in API
- added associated equipment data to CombinedEquipmentStatistics report in API
- added associated equipment data to CombinedEquipmentSaving report in API
- added associated equipment data to CombinedEquipmentOutput report in API
- added associated equipment data to CombinedEquipmentLoad report in API
- added associated equipment data to CombinedEquipmentIncome report in API
- added associated equipment data to CombinedEquipmentEnergyItem report in API
- added associated equipment data to CombinedEquipmentEnergyCategory report in API
- added quickmode parameter to combinedequipmentefficiency report in API
- added associated equipment data to CombinedEquipmentStatistics in Web UI
- added associated equipment data to CombinedEquipmentLoad in Web UI
- added excel exporter of equipmentcost reporter in API
- added associated equipment data to CombinedEquipmentEnergyItem report in API
- added AssociatedEquipmentTable to CombinedEquipmentIncome Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentSaving Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentOutput Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentIncome Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentCost Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI
- added last_run_datetime and next_run_datetime to rule in API
- added Deutsch (German) login language list in admin UI
- added associated equipment data to CombinedEquipmentCost report in API
- added associated equipment data to CombinedEquipmentStatistics report in API
- added associated equipment data to CombinedEquipmentSaving report in API
- added associated equipment data to CombinedEquipmentOutput report in API
- added associated equipment data to CombinedEquipmentLoad report in API
- added associated equipment data to CombinedEquipmentIncome report in API
- added associated equipment data to CombinedEquipmentEnergyItem report in API
- added associated equipment data to CombinedEquipmentEnergyCategory report in API
- added quickmode parameter to combinedequipmentefficiency report in API
- added associated equipment data to CombinedEquipmentStatistics in Web UI
- added associated equipment data to CombinedEquipmentLoad in Web UI
- added excel exporter of equipmentcost reporter in API
- added associated equipment data to CombinedEquipmentEnergyItem report in API
- added AssociatedEquipmentTable to CombinedEquipmentIncome Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentSaving Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentOutput Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentIncome Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentCost Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory Report in web UI
- added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI
- added last_run_datetime and next_run_datetime to rule in API
- added Deutsch (German) login language list in admin UI
### Changed
- reduced font size of meterrealtime in Web UI
- moved category before fdd_code of rule in admin UI and API
- reduced font size of meterrealtime in Web UI
- moved category before fdd_code of rule in admin UI and API
### Fixed
- fixed omission mistakes in myems-cleaning
- fixed error for large number of parameters in combinedequipmentefficiency and equipmentefficiency in API
- fixed error of None Comparison in API
- fixed NoneType error in all Load reports API.
- fixed omission mistakes in myems-cleaning
- fixed error for large number of parameters in combinedequipmentefficiency and equipmentefficiency in API
- fixed error of None Comparison in API
- fixed NoneType error in all Load reports API.
### Removed
- None.
- None.
## [v1.1.0] - 2021-03-18
## [v1.1.0] - 2021-03-18
### Added
- added excel exporter of equipmentefficiency report.
- added excel exporter of conbinedequipmentefficiency report in API.
- added 'optional' tips to meter,virtual meter and offline meter setting in admin UI.
- added Optional key to translation in admin UI.
- added cominbedequipmentefficiency report to api and web.
- added equipmentefficiency report api.
- added excel exporter of equipmentefficiency report.
- added excel exporter of conbinedequipmentefficiency report in API.
- added 'optional' tips to meter,virtual meter and offline meter setting in admin UI.
- added Optional key to translation in admin UI.
- added cominbedequipmentefficiency report to api and web.
- added equipmentefficiency report api.
### Changed
- updated cost file controller in admin UI
- updated user login session expire time to 8 hours.
- changed web UI and API to set contact of space is optional.
- updated cost file controller in admin UI
- updated user login session expire time to 8 hours.
- changed web UI and API to set contact of space is optional.
### Fixed
- fixed http headers issues of offlinemeterfile, knowledgefile and costfile in admin UI
- changed float datatype to Decimal datatype for offline meter normalization.
- fixed issue of add space in web UI.
- added historical database close and disconnect at the end of reports.
- fixed http headers issues of offlinemeterfile, knowledgefile and costfile in admin UI
- changed float datatype to Decimal datatype for offline meter normalization.
- fixed issue of add space in web UI.
- added historical database close and disconnect at the end of reports.
### Removed
- None.
- None.
## [v1.0.8] - 2021-03-11
## [v1.0.8] - 2021-03-11
### Added
- added excel exporter of combinedequipmentstatistics report
- added translation for German
- added excel exporter of storesaving report
- added excel exporter of equipmentincome report
- added excel exporter of shopfloorsaving report
- added excel exporter of equipmentload report
- added excel exporter of combinedequipmentstatistics report
- added translation for German
- added excel exporter of storesaving report
- added excel exporter of equipmentincome report
- added excel exporter of shopfloorsaving report
- added excel exporter of equipmentload report
### Changed
- Changed default reporting range in EnergyFlowDiagram.
- Changed default reporting range in EnergyFlowDiagram.
### Fixed
- None.
- None.
### Removed
- None.
- None.
## [v1.0.7] - 2021-03-07
## [v1.0.7] - 2021-03-07
### Added
- added excel exporter of storeload report
- added excel exporter of spaceincome report
- added excel exporter of equipmentsaving report
- added excel exporter of combinedequipmentsaving report
- added excel exporter of combinedequipmentload report
- added excel exporter of spaceoutput report
- added excel exporter of combinedequipmentoutput
- added excel exporter of combinedequipmentcost report
- added excel exporter of shopfloorcost report
- added excel exporter of shopfloorload report
- added excel exporter of combinedequipmentenergycategory report
- added excel exporter of combinedequipmentitem report.
- added excel exporter of equipmentenergyitem report.
- added excel exporter of equipmentenergycategory report.
- added excel exporter of shopfloorenergyitem report.
- added excel exporter of storeload report
- added excel exporter of spaceincome report
- added excel exporter of equipmentsaving report
- added excel exporter of combinedequipmentsaving report
- added excel exporter of combinedequipmentload report
- added excel exporter of spaceoutput report
- added excel exporter of combinedequipmentoutput
- added excel exporter of combinedequipmentcost report
- added excel exporter of shopfloorcost report
- added excel exporter of shopfloorload report
- added excel exporter of combinedequipmentenergycategory report
- added excel exporter of combinedequipmentitem report.
- added excel exporter of equipmentenergyitem report.
- added excel exporter of equipmentenergycategory report.
- added excel exporter of shopfloorenergyitem report.
### Changed
- None.
- None.
### Fixed
- fixed wrong HTTP headers in admin.
- fixed typo in combinedequipment controller in admin.
- fixed energy item undefined issue when edit virtual meter and offline meter.
- fixed wrong HTTP headers in admin.
- fixed typo in combinedequipment controller in admin.
- fixed energy item undefined issue when edit virtual meter and offline meter.
### Removed
- removed 'required' property from equipment model in admin.
- removed 'required' property from equipment model in admin.
## [v1.0.6] - 2021-02-26
## [v1.0.6] - 2021-02-26
### Added
- added store statistics report excel exporter.
- added equipment tracking excel exporter.
- added store cost report excel exporter.
- added equipment statistics report excel exporter.
- added store energy item report excel exporter.
- added shopfloor statistics report excel exporter.
- merged myems-api.
- added store statistics report excel exporter.
- added equipment tracking excel exporter.
- added store cost report excel exporter.
- added equipment statistics report excel exporter.
- added store energy item report excel exporter.
- added shopfloor statistics report excel exporter.
- merged myems-api.
### Changed
- modified database table tbl_energy_flow_diagrams_links
- modified database table tbl_energy_flow_diagrams_links
### Fixed
- fixed energy category names and units issue in EnergyItem reports.
- fixed energy category names and units issue in EnergyItem reports.
### Removed
- None.
- None.
## [v1.0.5] - 2021-02-23
## [v1.0.5] - 2021-02-23
### Added
- None.
- None.
### Changed
- None.
- None.
### Fixed
- None.
- None.
### Removed
- None.
- None.
[Unreleased]: https://github.com/MyEMS/myems/compare/v1.2.1...HEAD
[v1.2.1]: https://github.com/MyEMS/myems/compare/v1.2.0...v1.2.1

6
README.md
View File

@ -272,11 +272,11 @@ docker-compose up -d
## MyEMS镜像
[1]. [http://github.com/MyEMS/myems](http://github.com/MyEMS/myems)
[1]. [https://github.com/MyEMS/myems](https://github.com/MyEMS/myems)
[2]. [http://gitee.com/myems/myems](http://gitee.com/myems/myems)
[2]. [https://gitee.com/myems/myems](https://gitee.com/myems/myems)
[3]. [http://bitbucket.org/myems/myems](http://bitbucket.org/myems/myems)
[3]. [https://bitbucket.org/myems/myems](https://bitbucket.org/myems/myems)
[4]. [https://gitlab.com/myems/myems](https://gitlab.com/myems/myems)

6
README_DE.md
View File

@ -274,11 +274,11 @@ docker-compose up -d
## MyEMS Spiegel
[1]. [http://github.com/MyEMS/myems](http://github.com/MyEMS/myems)
[1]. [https://github.com/MyEMS/myems](https://github.com/MyEMS/myems)
[2]. [http://gitee.com/myems/myems](http://gitee.com/myems/myems)
[2]. [https://gitee.com/myems/myems](https://gitee.com/myems/myems)
[3]. [http://bitbucket.org/myems/myems](http://bitbucket.org/myems/myems)
[3]. [https://bitbucket.org/myems/myems](https://bitbucket.org/myems/myems)
[4]. [https://gitlab.com/myems/myems](https://gitlab.com/myems/myems)

6
README_EN.md
View File

@ -274,11 +274,11 @@ docker-compose up -d
## MyEMS Mirrors
[1]. [http://github.com/MyEMS/myems](http://github.com/MyEMS/myems)
[1]. [https://github.com/MyEMS/myems](https://github.com/MyEMS/myems)
[2]. [http://gitee.com/myems/myems](http://gitee.com/myems/myems)
[2]. [https://gitee.com/myems/myems](https://gitee.com/myems/myems)
[3]. [http://bitbucket.org/myems/myems](http://bitbucket.org/myems/myems)
[3]. [https://bitbucket.org/myems/myems](https://bitbucket.org/myems/myems)
[4]. [https://gitlab.com/myems/myems](https://gitlab.com/myems/myems)

2
database/README.md
View File

@ -4,7 +4,6 @@
Providing database schema and scripts for MyEMS.
### Prerequisites
[MySQL 8.0 or later](https://www.mysql.com/)
@ -12,7 +11,6 @@ Providing database schema and scripts for MyEMS.
or [SingleStore 7.0 or later](https://www.singlestore.com/) (highly recommended)
### Installation
Execute the following scripts in MySQL commandline, or execute in other MySQL client tools such as MySQL Workbench, Navicat, DBaver, phpMyAdmin, etc.

820
myems-api/README.md
View File

File diff suppressed because it is too large Load Diff

10
myems-api/installation_macos_zh.md
View File

@ -2,7 +2,7 @@
## macOS（v11.2.1）
#### 1.Python
### 1.Python
MyEMS要求Python版本在3.5+，这里用brew来安装最新别的`Python3.9`版本,不过要先安装`Xcode Command Line Tools`，否则安装python会报错。
```bash
@ -21,7 +21,7 @@ $echo 'export HOMEBREW_BOTTLE_DOMAIN=https://mirrors.aliyun.com/homebrew/homebre
$source ~/.zshrc
```
#### 2.MySQL
### 2.MySQL
MyEMS默认使用MySQL8.0，也是采用brew来安装
```shell
@ -82,7 +82,7 @@ mysql> show databases; // 查看数据库是否导入OK
13 rows in set (0.02 sec)
```
#### 3.部署mymes-api服务
### 3.部署mymes-api服务
安装一堆python依赖库
```shell
# 安装anytree
@ -133,7 +133,7 @@ export PATH="/usr/local/Cellar/python@3.9/3.9.1_8/Frameworks/Python.framework/Ve
$ source ~/.zshrc
```
#### 4.运行myems-api服务
### 4.运行myems-api服务
```shell
$ git clone https://github.com/kuuyee/myems-api.git
$ cd myems-api
@ -146,7 +146,7 @@ $ gunicorn -b 127.0.0.1:8000 app:api
//启动成功
```
#### 5.验证myems-api服务
### 5.验证myems-api服务
打开浏览器访问[http://localhost:8000/version](http://localhost:8000/version)
如果看到如下输出就表示服务启动正常。

4
myems-cleaning/README.md
View File

@ -60,5 +60,5 @@ View the log:
### References
1. https://myems.io
2. https://dev.mysql.com/doc/connector-python/en/
1. https://myems.io
2. https://dev.mysql.com/doc/connector-python/en/

12
myems-normalization/README.md
View File

@ -1,14 +1,11 @@
## MyEMS Normalization Service 数据规范化服务
### Introduction
This service is a component of MyEMS and it normalizes energy data in historical database.
![MyEMS Meter Normalization](../docs/images/meter-normalization.png)
### Prerequisites
mysql.connector
@ -17,7 +14,6 @@ sympy
openpyxl
### Installation
Download and install MySQL Connector:
@ -103,7 +99,7 @@ View the log:
### References
1. https://myems.io
2. https://dev.mysql.com/doc/connector-python/en/
3. https://github.com/sympy/sympy
4. https://openpyxl.readthedocs.io
1. https://myems.io
2. https://dev.mysql.com/doc/connector-python/en/
3. https://github.com/sympy/sympy
4. https://openpyxl.readthedocs.io

30
web/README.md vendored
View File

@ -9,11 +9,10 @@ Node.js
nginx-1.18.0 or later
## Running in Local environment
This project is scaffolded using Create React App.
* Install Node.js via binary archive on Linux
* Install Node.js via binary archive on Linux
Download Current Linux Binaries (x64) from https://nodejs.org/en/download/current/
Unzip the binary archive to /usr/local/bin/nodejs,
@ -42,17 +41,18 @@ npm version
npx -v
```
* Open the “myems/web” directory with your cmd or terminal
* Run 'sudo npm i --unsafe-perm=true --allow-root'
* Open the “myems/web” directory with your cmd or terminal
* Run 'sudo npm i --unsafe-perm=true --allow-root'
This command will download all the necessary dependencies for falcon in the node_modules directory.
* If you modified any scss files, then you need to compile SCSS
* If you modified any scss files, then you need to compile SCSS
Run 'sudo npm run scss' command in your project directory to compile scss.
* Run 'sudo npm start'
* Run 'sudo npm start'
A local web server will start at http://localhost:3000.
We are using webpack and webpack-serve to automatically detect file changes. So, if you edit and save a file, your browser will automatically refresh and preview the change.
## Creating a Production Build
* Run 'sudo npm run build' command in your project directory to make the Production build.
* Run 'sudo npm run build' command in your project directory to make the Production build.
This will create an optimized production build by compililing, merging and minifying all the source files as necessary and put them in the build/ folder.
@ -60,11 +60,11 @@ You can run 'node server.js' to run the production build locally at http://local
## Option 1: Install Production Build on NGINX Server
* Install NGINX Server
* Install NGINX Server
refer to http://nginx.org/en/docs/install.html
* Configure NGINX
* Configure NGINX
```
$ sudo nano /etc/nginx/nginx.conf
```
@ -107,12 +107,12 @@ Restart NGINX
$ sudo systemctl restart nginx
```
* Download myems:
* Download myems:
```
$ cd ~
$ git clone https://github.com/MyEMS/myems.git
```
* Install myems-web :
* Install myems-web :
Check and change the config file if necessary:
```
@ -134,11 +134,11 @@ $ sudo systemctl restart nginx
```
## Option 2: Install Production Build on Apache2 Server
* Install Apache2 Server
* Install Apache2 Server
refer to https://httpd.apache.org/docs/2.4/install.html
* Configure Apache2
* Configure Apache2
```
$ sudo vi /etc/apache2/ports.conf
```
@ -165,12 +165,12 @@ Add a new 'VirtualHost' as below
</VirtualHost>
```
* Download myems:
* Download myems:
```
$ cd ~
$ git clone https://github.com/MyEMS/myems.git
```
* Install myems-web :
* Install myems-web :
Check and change the config file if necessary:
```