Commit Graph

1514 Commits (f8bce22cedc1f1671a7abfb3ccf23e523f37603c)

Author SHA1 Message Date
13621160019@163.com f8bce22ced Merge branch 'develop' 2021-10-26 22:13:36 +08:00
13621160019@163.com f0cb2128e6 udpated README 2021-10-26 22:13:27 +08:00
13621160019@163.com 4bfa882951 Merge branch 'develop' 2021-10-25 20:21:39 +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 895f0e7e9c fixed warnings in myems-aggregation service
Merge branch 'develop'
2021-10-24 17:48:21 +08:00
13621160019@163.com 04df9ac030 fixed warnings in myems-aggregation service 2021-10-24 17:47:22 +08:00
13621160019@163.com 02df2e3ef0 fixed detailed data sort issues in Web UI
Merge branch 'develop'
2021-10-24 16:36:33 +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 2208d0e48f fixed detailed data sort issues of Batch reports in Web UI
Merge branch 'develop'
2021-10-23 20:03:22 +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 6d7a0209d6 fixed detailed data sort issue in StoreBatch report
Merge branch 'develop'
2021-10-23 17:53:10 +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 fd4e8573a2 updated version number to v1.3.2
Merge branch 'develop'
2021-10-22 16:53:45 +08:00
13621160019@163.com 6c69ad4f23 updated version number to v1.3.2 2021-10-22 16:53:32 +08:00
13621160019@163.com 7d880e4138 reformatted excel exporters of shopfloor reports
Merge branch 'develop'
2021-10-22 16:12:48 +08:00
13621160019@163.com c2725a9023 reformatted excel exporters of shopfloor reports 2021-10-22 16:12:29 +08:00
13621160019@163.com 803fe46d68 reformatted excel exporters of store reports
Merge branch 'develop'
2021-10-22 13:13:52 +08:00
13621160019@163.com 3d6bceb4db reformatted excel exporters of store reports 2021-10-22 13:13:44 +08:00
13621160019@163.com d97fb1dc82 reformatted excel exporters of tenant reports
Merge branch 'develop'
2021-10-21 21:24:16 +08:00
13621160019@163.com f968f17de3 reformatted excel exporters of tenant reports 2021-10-21 21:23:48 +08:00
13621160019@163.com 9512ac0a8e reformatted excel exporters of equipment reports'
Merge branch 'develop'
2021-10-21 20:57:13 +08:00
13621160019@163.com d9a0fe53b5 reformatted excel exporters of equipment reports 2021-10-21 20:56:28 +08:00
13621160019@163.com 7b50642868 removed unused code from excel exporter of equipmentenergycategory
Merge branch 'develop'
2021-10-21 19:38:44 +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 b545520883 added associated equipments data to combinedequipmentefficiency report
Merge branch 'develop'
2021-10-20 15:59:37 +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 c46911185e added Pie Charts of TCE/TCO2E to excelexporters of equipmentenergycategory, combinedequipmentenergycategory and storeenergycategory
Merge branch 'develop'
2021-10-20 15:22:25 +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 9e1bbe5ef6 added Pie Charts of TCE and TCO2E to excel exporter of shopfloorenergycategory report
Merge branch 'develop'
2021-10-19 19:08:26 +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 92b1a582d0 added validation for area of shopfloor, space, store and tenant in API
Merge branch 'develop'
2021-10-19 18:47:10 +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 b5e9c9669c renamed parameter worksheet names in excel exporters
Merge branch 'develop'
2021-10-18 14:49:51 +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 58ab078b64 updated database demo data in German
Merge branch 'develop'
2021-10-17 11:27:37 +08:00
13621160019@163.com 1a3999f983 updated database demo data in German 2021-10-17 11:23:20 +08:00
13621160019@163.com 3f440bdf96 updated Database Demo in English
Merge branch 'develop'
2021-10-16 22:57:47 +08:00
13621160019@163.com 5ac74c5ad3 updated Database Demo in English 2021-10-16 22:55:20 +08:00
13621160019@163.com fe28682828 upated version number to v1.3.1
Merge branch 'develop'
2021-10-15 16:34:20 +08:00