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

487 Commits (f9fb61035d79ee1a7ac66bb5cd1d3d30f9edfd48)

Author SHA1 Message Date
13621160019@163.com 7595d87b96 added installation on docker to readme of admin ui 2021-11-05 19:04:34 +08:00
13621160019@163.com 753b2a86ce added installation on docker to README 2021-11-05 17:52:22 +08:00
13621160019@163.com df91f3b170 added installation on docker to README of myems-api 2021-11-05 16:42:06 +08:00
13621160019@163.com cfe749e44d added weekly to i18n of Web UI 2021-11-04 21:18:50 +08:00
Caozhenhui 2c748d2eee Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method 2021-11-04 20:24:51 +08:00
Caozhenhui bffef535ea Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method 2021-11-04 19:50:44 +08:00
Caozhenhui 67f22d2dd3 Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method 2021-11-04 19:49:23 +08:00
Caozhenhui caa65ef136 Added the time scale of weekly in statistics_hourly_data_by_period 2021-11-04 16:24:23 +08:00
Caozhenhui 88e33fa9c6 Added the time scale of weekly 2021-11-03 11:09:48 +08:00
Caozhenhui 4a44727a0a Added the time scale of weekly 2021-11-03 11:00:17 +08:00
Caozhenhui 3fc620b596 Added the time scale of weekly 2021-11-03 10:32:16 +08:00
Caozhenhui 62ad53d430 Merge remote-tracking branch 'upstream/develop' into develop 2021-11-02 17:03:08 +08:00
guangyuzhang 8d421975c5 updated Dockerfiles 2021-11-01 14:52:33 +08:00
Caozhenhui 9ea6c505a5 Added the time scale of weekly to all required files 2021-11-01 11:28:07 +08:00
13621160019@163.com 913061987d updated README 2021-10-30 18:53:35 +08:00
13621160019@163.com 70151b020f updated version number to v1.3.3 2021-10-30 16:11:12 +08:00
13621160019@163.com ff30e3a805 updated README and database test procedure 2021-10-30 13:30:46 +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
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 7f212e209d Added the time scale of weekly to meterenergy 2021-10-26 19:35:10 +08:00
13621160019@163.com c20600d7fe removed unused import from API 2021-10-25 20:06:58 +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 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
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 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 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 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
13621160019@163.com b2ac741fdc fixed worksheet name error in combined equipment efficiency excel exporter 2021-10-13 22:22:33 +08:00
13621160019@163.com 3c3016f8e1 updated maximum load value according to MINUTES_TO_COUNT in tenantbatch report 2021-10-13 21:58:36 +08:00
Caozhenhui f729744960 Merge remote-tracking branch 'upstream/develop' into develop 2021-10-13 13:23:18 +08:00
13621160019@163.com b97c16fbb9 updated config.py files to move all variables to .env files via Python Decouple 2021-10-12 18:39:42 +08:00