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

687 Commits (2e9e151bfd8d4dacafbb1d56fc8e1eb64109f70c)

Author SHA1 Message Date
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
13621160019@163.com dd29578732 added screenshot gif to README 2021-03-21 13:12:14 +08:00
13621160019@163.com a47a36399e updated README 
Merge branch 'develop'
 2021-03-21 12:55:31 +08:00
13621160019@163.com 487aa7cbf6 updated README 2021-03-21 12:53:46 +08:00
13621160019@163.com d85520dcee Updated README 
Merge branch 'develop'
 2021-03-21 10:48:49 +08:00
13621160019@163.com 0d0d5bf52c updated README 2021-03-21 10:47:54 +08:00
guangyuzhang 488a877f91 added Deutsch (German) login language list in admin UI 
Merge branch 'develop'
 2021-03-21 09:11:08 +08:00
guangyuzhang 9e6362df25 added Deutsch (German) login language list in admin UI 2021-03-21 09:09:29 +08:00
guangyuzhang 5ab51ebdb2 updated README 
Merge branch 'develop'
 2021-03-20 11:05:41 +08:00
guangyuzhang 214ca9f373 updated README 2021-03-20 11:01:29 +08:00
13621160019@163.com 3894b917ef updated README 
Merge branch 'develop'
 2021-03-19 20:12:37 +08:00
13621160019@163.com 007652a5a3 updated README 2021-03-19 20:12:28 +08:00
13621160019@163.com b24417ade5 updated README 
Merge branch 'develop'
 2021-03-19 19:36:33 +08:00
13621160019@163.com 42b2ba90cd udpated README 2021-03-19 19:35:43 +08:00
13621160019@163.com 9a17bcaba0 Updated README 
Merge branch 'develop'
 2021-03-19 18:47:10 +08:00
13621160019@163.com c1cc6c6c10 updated README 2021-03-19 18:39:04 +08:00
13621160019@163.com 952feebe77 updated README 2021-03-19 18:35:22 +08:00
13621160019@163.com fb9e2361bc Merge branch 'develop' 2021-03-19 15:05:35 +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 7527549e60 fixed undefined error in virtualmeterenergy report API 
Merge branch 'develop'
 2021-03-19 13:36:19 +08:00
13621160019@163.com 30a026c347 fixed undefined error in virtualmeterenergy report API 2021-03-19 13:35:56 +08:00
13621160019@163.com e0d1f04f71 updated excel exporter of combinedequipmentefficiency report 
Merge branch 'develop'
 2021-03-19 10:50:58 +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 3e36ca87c5 updated version to v1.1.0 
Merge branch 'develop'
 2021-03-18 11:53:30 +08:00
13621160019@163.com c08db755f4 updated version to v1.1.0 2021-03-18 11:47:46 +08:00
13621160019@163.com c3eae6553d added excel exporter of equipmentefficiency report 
Merge branch 'develop'
 2021-03-18 11:31:23 +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 c16db2e411 added excel exporter of conbinedequipmentefficiency report in API 
Merge branch 'develop'
 2021-03-18 10:02:44 +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
13621160019@163.com 23839601bf added 'optional' tips to meter,virtual meter and offline meter setting in admin UI 
Merge branch 'develop'
 2021-03-17 17:25:53 +08:00
13621160019@163.com 373c2a1fb1 added 'optional' tips to meter,virtual meter and offline meter setting in admin UI 2021-03-17 17:24:34 +08:00