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

722 Commits (24f970fa02c672408560bd51512f0dc6dfd50f7c)

Author SHA1 Message Date
13621160019@163.com 398f96d4bd fixed error of None Comparision in API 2021-03-25 12:15:20 +08:00
13621160019@163.com 95f2e37c78 added sample data for myems_fdd_db.tbl_rules 2021-03-24 11:17:21 +08:00
13621160019@163.com 01cdb7bc11 added sample data for myems_fdd_db.tbl_rules 2021-03-24 10:57:05 +08:00
hyh123a e253cf3617 Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-24 10:33:04 +08:00
13621160019@163.com 64cc72119e added AssociatedEquipmentTable to CombinedEquipmentSaving report in web UI 
Merge branch 'develop'
 2021-03-23 18:17:01 +08:00
13621160019@163.com d82f1eb829 added AssociatedEquipmentTable to CombinedEquipmentSaving report in web UI 2021-03-23 18:13:09 +08:00
13621160019@163.com 097b15c2d0 added AssociatedEquipmentTable to CombinedEquipmentOutput report in web UI 
Merge branch 'develop'
 2021-03-23 18:11:04 +08:00
13621160019@163.com 3efce5f620 added AssociatedEquipmentTable to CombinedEquipmentOutput report in web UI 2021-03-23 18:09:52 +08:00
13621160019@163.com ff51822b08 added AssociatedEquipmentTable to CombinedEquipmentIncome report in web UI 
Merge branch 'develop'
 2021-03-23 18:07:42 +08:00
13621160019@163.com 78ba4d0ed1 added AssociatedEquipmentTable to CombinedEquipmentIncome report in web UI 2021-03-23 18:06:42 +08:00
13621160019@163.com 13592ccdea added AssociatedEquipmentTable to CombinedEquipmentCost report in web UI 
Merge branch 'develop'
 2021-03-23 18:02:32 +08:00
13621160019@163.com 59d195bdb2 added AssociatedEquipmentTable to CombinedEquipmentCost report in web UI 2021-03-23 18:00:38 +08:00
13621160019@163.com 6b37d58466 added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory report in web UI 
Merge branch 'develop'
 2021-03-23 17:57:04 +08:00
13621160019@163.com 64db7d9542 added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory report in web UI 2021-03-23 17:56:06 +08:00
13621160019@163.com 36a9eed599 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem report in web UI 
Merge branch 'develop'
 2021-03-23 17:47:40 +08:00
13621160019@163.com 60c55df622 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI 2021-03-23 17:47:16 +08:00
13621160019@163.com 6ee35da206 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI 2021-03-23 17:46:54 +08:00
Caozhenhui ca4fdc0872 2021/3/23 #86 2021-03-23 17:19:03 +08:00
13621160019@163.com 6779eff096 fixed NoneType error in ShopfloorLoad report in API 
Merge branch 'develop'
 2021-03-23 16:47:20 +08:00
13621160019@163.com fca523a616 fixed NoneType error in ShopfloorLoad report in API 2021-03-23 16:46:09 +08:00
Caozhenhui 92a8e9dbf5 Merge remote-tracking branch 'upstream/develop' into issue#86 2021-03-23 16:15:17 +08:00
13621160019@163.com ae5df59325 fixed NoneType error in CombinedEquipmentLoad report in API 
Merge branch 'develop'
 2021-03-23 16:01:57 +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 7d88b63dd5 fixed NoneType error in StoreLoad report API 
Merge branch 'develop'
 2021-03-23 15:59:22 +08:00
13621160019@163.com 1448c17749 fixed NoneType error in StoreLoad report API 2021-03-23 15:58:50 +08:00
13621160019@163.com 66dcba4cce fixed NoneType error in TenantLoad Report API 
Merge branch 'develop'
 2021-03-23 15:54:56 +08:00
13621160019@163.com 6a1b986f56 fixed NoneType error in TenantLoad Report API 2021-03-23 15:54:48 +08:00
13621160019@163.com f46ceb8790 fixed NoneType error in EquipmentLoad Report API 
Merge branch 'develop'
 2021-03-23 15:48:58 +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 f0c730cd07 fixed NoneType issue in SpaceEfficiency report API 
Merge branch 'develop'
 2021-03-23 15:21:15 +08:00
13621160019@163.com f38d7e3691 fixed NoneType issue in SpaceEfficiency Report API 2021-03-23 15:20:32 +08:00
13621160019@163.com 58cc086cc6 fixed typo in database 2021-03-23 11:32:07 +08:00
hyh123a 32302f12ae add the fdd demo rule 2021-03-23 11:30:55 +08:00
13621160019@163.com a78996088a moved category before fdd_code of rule in admin UI and API 
Merge branch 'develop'
 2021-03-23 10:52:31 +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 10e8fa2e84 added last_run_datetime and next_run_datetime to rule in admin UI 
Merge branch 'develop'
 2021-03-22 18:18:39 +08:00
13621160019@163.com c9aa2a1f23 added last_run_datetime and next_run_datetime to rule in admin UI 2021-03-22 18:13:16 +08:00
Caozhenhui 8d2f582a7e Merge remote-tracking branch 'upstream/develop' into develop 2021-03-22 18:10:37 +08:00
Caozhenhui b744e59f2f Merge branch 'issue22' into develop 2021-03-22 17:51:57 +08:00
13621160019@163.com 11200807c6 added last_run_datetime and next_run_datetime to rule in API 
Merge branch 'develop'
 2021-03-22 17:30:33 +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 2828bea5da added columns to tbl_rules and upgraded database to v1.1.1 
Merge branch 'develop'
 2021-03-22 15:55:10 +08:00
13621160019@163.com da895a79dd Merge branch 'develop' of https://github.com/MyEMS/myems into develop 2021-03-22 15:54:22 +08:00
13621160019@163.com 4a3becb837 added columns to tbl_rules and upgraded database to v1.1.1 2021-03-22 15:53:16 +08:00
guangyuzhang 3ca20af5fa updated README 
Merge branch 'develop'
 2021-03-21 22:44:25 +08:00
guangyuzhang 78b02c7485 updated README 2021-03-21 22:42:24 +08:00
13621160019@163.com 1b935d7c95 updated images in README 
Merge branch 'develop'
 2021-03-21 13:31:57 +08:00
13621160019@163.com 7339c996da updated images in README 2021-03-21 13:29:32 +08:00
13621160019@163.com 42a08cae93 added screenshot gif to README 
Merge branch 'develop'
 2021-03-21 13:14:11 +08:00