seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,505 Commits
2 Branches
32 Tags
112 MiB
Commit Graph

1505 Commits (ff30e3a805450451f2c48885972274fe57ae29b1)

Author SHA1 Message Date
13621160019@163.com ff30e3a805 updated README and database test procedure 2021-10-30 13:30:46 +08:00
13621160019@163.com 658160e1be updated README and database test 2021-10-30 12:58:29 +08:00
13621160019@163.com 4f4b5d52c6 added missing rule_id in myems_fdd_db 2021-10-29 17:43:57 +08:00
13621160019@163.com a5e0871def added validation of offline meter hourly values to myems-normalization service 
Merge branch 'PR75' into develop
 2021-10-28 23:08:43 +08:00
13621160019@163.com 8d82b5e474 updated offline meter data template file 2021-10-28 23:08:16 +08:00
13621160019@163.com f3cda07639 added new period type 'weekly' to meterenergy and aggregate_hourly_data_by_period in API 
Merge branch 'PR76' into develop
 2021-10-28 21:53:41 +08:00
13621160019@163.com 5f285d7939 updated commments in aggregate_hourly_data_by_period of API 2021-10-28 21:53:24 +08:00
13621160019@163.com 8353ca2b88 updated myems-api installation 2021-10-28 12:23:27 +08:00
13621160019@163.com 58729e671d fixed NoneType error in myems-cleaning service 2021-10-27 18:49:56 +08:00
Caozhenhui 0c1a2d9ab8 Modified comments 2021-10-27 10:05:35 +08:00
Caozhenhui fedcb71d3f Modified comments 2021-10-27 09:54:59 +08:00
Caozhenhui 21901667cb simplified code 2021-10-27 09:51:34 +08:00
Caozhenhui 88eb2dfc07 simplified code 2021-10-27 09:29:33 +08:00
Caozhenhui c8c51f7c91 Merge remote-tracking branch 'upstream/develop' into develop 2021-10-27 09:28:38 +08:00
13621160019@163.com b005376841 updated README 2021-10-26 23:40:49 +08:00
13621160019@163.com f0cb2128e6 udpated README 2021-10-26 22:13:27 +08:00
Caozhenhui 7f212e209d Added the time scale of weekly to meterenergy 2021-10-26 19:35:10 +08:00
tianlinzhong 03ba920c38 Added verification of daily energy consumption range during offline table import 2021-10-26 19:29:51 +08:00
13621160019@163.com 61deab4fa5 removed duplicate entry in i18n of Web UI 2021-10-25 20:07:32 +08:00
13621160019@163.com c20600d7fe removed unused import from API 2021-10-25 20:06:58 +08:00
13621160019@163.com 04df9ac030 fixed warnings in myems-aggregation service 2021-10-24 17:47:22 +08:00
13621160019@163.com 545d16660d fixed detailed data sort issues in Web UI 2021-10-24 16:30:52 +08:00
13621160019@163.com e38126e8b0 fixed detailed data sort issues of Batch reports in Web UI 2021-10-23 20:00:17 +08:00
13621160019@163.com 45bb1790de fixed detailed data sort issue in StoreBatch report 
Merge branch 'PR74' into develop
 2021-10-23 17:51:44 +08:00
YangZhang-GitHub 5be1d5f72c The sorting method of detailed energy consumption data is changed from alphabetical to quantity-value 2021-10-22 17:52:06 +08:00
13621160019@163.com 6c69ad4f23 updated version number to v1.3.2 2021-10-22 16:53:32 +08:00
13621160019@163.com c2725a9023 reformatted excel exporters of shopfloor reports 2021-10-22 16:12:29 +08:00
13621160019@163.com 3d6bceb4db reformatted excel exporters of store reports 2021-10-22 13:13:44 +08:00
13621160019@163.com f968f17de3 reformatted excel exporters of tenant reports 2021-10-21 21:23:48 +08:00
13621160019@163.com d9a0fe53b5 reformatted excel exporters of equipment reports 2021-10-21 20:56:28 +08:00
13621160019@163.com 3a484f9e54 removed unused code from excelexporter of equipmentenergycategory 
Merge branch 'PR73' into develop
 2021-10-21 19:37:22 +08:00
Caozhenhui 20b05f769d Remove Child Space Data Section from EquipmentEnergyCategory Excel Exporter 2021-10-20 17:50:46 +08:00
13621160019@163.com 05110a1efe added associated equipments data to combinedequipmentefficiency report 
Merge branch 'PR72' into develop
 2021-10-20 15:56:37 +08:00
13621160019@163.com 087815c219 fixed PEP8 warnings 2021-10-20 15:56:27 +08:00
13621160019@163.com 63e414b038 added Pie Charts of TCE/TCO2E to excelexporters of equipmentenergycategory, combinedequipmentenergycategory and storeenergycategory 
Merge branch 'PR71' into develop
 2021-10-20 15:10:52 +08:00
13621160019@163.com e65cd550a2 deleted unused comments from excelexporters 2021-10-20 15:10:40 +08:00
tianlinzhong f4166091b7 Added Associated Equpment Data to CombinedEquipmentEfficiency Report in web UI and API 2021-10-20 13:45:19 +08:00
Caozhenhui 14dddada7f Added Pie Charts of TCE/TCO2E 2021-10-20 10:37:33 +08:00
13621160019@163.com 67191817ef added Pie charts of TCE and TCO2E to excel exporter of shopfloorenergycategory report 
Merge branch 'PR70' into develop
 2021-10-19 19:06:22 +08:00
13621160019@163.com 4616712828 cleared unused comments 2021-10-19 19:06:02 +08:00
13621160019@163.com 32256396ac added validation for area of shopfloor, space, store and tenant in API 2021-10-19 18:45:17 +08:00
Caozhenhui d6f24b6e8d Added Pie Charts of TCE/TCO2E to ShopfloorEnergycategory Excel Exporter 2021-10-19 13:51:21 +08:00
13621160019@163.com b9c8352b00 renamed parameter worksheet names in excel exporters 
Merge branch 'PR69' into develop
 2021-10-18 14:49:07 +08:00
13621160019@163.com f128c477b7 fixed warnings in excel exporters 2021-10-18 14:48:55 +08:00
tianlinzhong cf26d8c700 Rename All Parameter Worksheet Names in Excel Exporters 2021-10-18 10:57:35 +08:00
13621160019@163.com 1a3999f983 updated database demo data in German 2021-10-17 11:23:20 +08:00
13621160019@163.com 5ac74c5ad3 updated Database Demo in English 2021-10-16 22:55:20 +08:00
13621160019@163.com 3936b7c2e7 updated version number to v1.3.1 2021-10-15 16:31:00 +08:00
13621160019@163.com 7eb5effd6a updated README files 2021-10-15 14:30:17 +08:00
13621160019@163.com 55b5024619 renamed example.env files and fixed typos in config 2021-10-15 13:32:43 +08:00