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

157 Commits (f676ec7199af36c5c527aab66c0e759f2b75dccd)

Author SHA1 Message Date
13621160019@163.com 9e32d75470 added associated equipment to combinedequipmentenergyitem report in API 
Merge branch 'PR23' into develop
 2021-03-26 10:31:16 +08:00
13621160019@163.com 1296e69231 fixed typo in combinedequipmentenergyitem report in API 2021-03-26 10:31:05 +08:00
Caozhenhui 3ccce287ee added associated equipment data to CombinedEquipmentEnergyItem report & excel reporter 2021-03-25 17:10:37 +08:00
YangZhang-GitHub eb0c2df3e0 Fixed a bug 2021-03-25 16:03:51 +08:00
13621160019@163.com 398f96d4bd fixed error of None Comparision in API 2021-03-25 12:15:20 +08:00
Caozhenhui ca4fdc0872 2021/3/23 #86 2021-03-23 17:19:03 +08:00
13621160019@163.com fca523a616 fixed NoneType error in ShopfloorLoad report in API 2021-03-23 16:46:09 +08:00
13621160019@163.com 7a86423068 fixed NoneType error in CombinedEquipmentLoad report in API 2021-03-23 16:01:44 +08:00
13621160019@163.com 1448c17749 fixed NoneType error in StoreLoad report API 2021-03-23 15:58:50 +08:00
13621160019@163.com 6a1b986f56 fixed NoneType error in TenantLoad Report API 2021-03-23 15:54:48 +08:00
13621160019@163.com 9538ffc1e3 fixed NoneType error in EquipmentLoad Report API 2021-03-23 15:48:44 +08:00
13621160019@163.com c7559e0470 fixed NoneType error in SpaceLoad report in API 2021-03-23 15:42:31 +08:00
13621160019@163.com f38d7e3691 fixed NoneType issue in SpaceEfficiency Report API 2021-03-23 15:20:32 +08:00
13621160019@163.com cee412557a moved category before fdd_code of rule in admin UI and API 2021-03-23 10:51:34 +08:00
13621160019@163.com 5ab0f47c96 added last_run_datetime and next_run_datetime to rule in API 2021-03-22 17:29:40 +08:00
13621160019@163.com e614888026 fixed issues of excel exporter of conbinedequipmentefficiency and equipmentefficiency reports in API 
Merge branch 'PR22' into develop
 2021-03-19 14:57:29 +08:00
YangZhang-GitHub fadbb98b1d Fixed a bug 2021-03-19 14:15:36 +08:00
13621160019@163.com 30a026c347 fixed undefined error in virtualmeterenergy report API 2021-03-19 13:35:56 +08:00
13621160019@163.com a5789343e8 updated excel exporter of combinedequipmentefficiency report 
Merge branch 'PR21' into develop
 2021-03-19 10:45:06 +08:00
13621160019@163.com c08db755f4 updated version to v1.1.0 2021-03-18 11:47:46 +08:00
13621160019@163.com 0f3e5ff641 added excel exporter of equipmentefficiency report 
Merge branch 'PR20' into develop
 2021-03-18 11:29:57 +08:00
YangZhang-GitHub a425b8ff35 Added row height to resolve the problem of incomplete time display 2021-03-18 11:26:08 +08:00
YangZhang-GitHub b6d9b44765 Added row height to resolve the problem of incomplete time display 2021-03-18 11:24:48 +08:00
YangZhang-GitHub c3a5799bb9 Implemented the EquipmentEfficiency Excel Exporter 2021-03-18 10:14:10 +08:00
YangZhang-GitHub b72d7b48bb Added 'excelexporters.equipmentefficiency.export()' method 2021-03-18 10:13:29 +08:00
13621160019@163.com d35ccb4302 added excel exporter of conbinedequipmentefficiency report in API 
Merge branch 'PR19' into develop
 2021-03-18 10:00:40 +08:00
YangZhang-GitHub 8b25860ad7 Modify the layout 2021-03-17 14:43:44 +08:00
YangZhang-GitHub 3d5d924d56 Modify the column width 2021-03-16 15:00:26 +08:00
13621160019@163.com 82479e8b18 fixed issue when deleting offline meter file 2021-03-16 12:07:10 +08:00
13621160019@163.com 45414659df updated user login session expire time to 8 hours 2021-03-16 12:05:43 +08:00
YangZhang-GitHub 3d143fecc3 Inspect Code 2021-03-15 19:01:36 +08:00
YangZhang-GitHub dd1fe3c2d4 Improvement of related parameter time 2021-03-15 18:59:52 +08:00
YangZhang-GitHub b531831499 Implemented the CombinedEquipmentEfficiency Excel Exporter 2021-03-15 17:20:09 +08:00
YangZhang-GitHub e47166aa09 Added 'excelexporters.combinedequipmentefficiency.export()' method 2021-03-15 17:16:01 +08:00
13621160019@163.com 57b6dd3266 changed to set contact of space is optional in web UI and API 2021-03-15 13:46:16 +08:00
13621160019@163.com d242e7226a fixed typos in combindedequipmentefficiency and equipmentefficiency report api 2021-03-14 16:40:57 +08:00
13621160019@163.com f870e8b483 fixed issues of historcial database close and disconnect in api 2021-03-13 09:19:33 +08:00
13621160019@163.com 82fb8c2e5a added cominbedequipmentefficiency report to api and web 2021-03-13 08:14:21 +08:00
13621160019@163.com 9f6f688cce fixed issue in eqipmentefficiency report 2021-03-12 22:28:05 +08:00
13621160019@163.com db6f0a4662 added equipmentefficiency report api 2021-03-12 19:59:28 +08:00
13621160019@163.com 319b5738d9 added historical database close and disconnect at the end of reports 2021-03-12 14:44:15 +08:00
13621160019@163.com 7eb371bf30 updated version to v1.0.8 2021-03-11 16:09:33 +08:00
Caozhenhui e9a272a68f change line chart insertion position and delete annotation code 2021-03-11 15:47:18 +08:00
Caozhenhui 2d966aa46a Change the code variable name and add the LineChart comment 2021-03-10 19:27:30 +08:00
Caozhenhui cdfe37dd2a Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 19:23:39 +08:00
13621160019@163.com 6c2d66019f updated excel exporters of combinedequipmentenergyitem, combinedequipmentoutput, equipmentenergyitem, equipmentoutput, shopfloorenergyitem, spaceoutput, storeenergyitem and tenantenergytime 
Merge branch 'PR6' into develop
 2021-03-10 19:00:36 +08:00
Caozhenhui d962457c67 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 16:06:16 +08:00
13621160019@163.com e863754cc3 updated excel exporter of spacesot, spaceenergycategory, spaceenergyitem and spaceincome 
Merge branch 'PR13' into develop
 2021-03-10 13:23:51 +08:00
13621160019@163.com c9cb56d8ee fixed issue in excel exporter of spaceincome report 2021-03-10 13:23:40 +08:00
Caozhenhui 7345f1de8a Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 12:58:04 +08:00