13621160019@163.com
|
78ba4d0ed1
|
added AssociatedEquipmentTable to CombinedEquipmentIncome report in web UI
|
2021-03-23 18:06:42 +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
|
64db7d9542
|
added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory report in web UI
|
2021-03-23 17:56:06 +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
|
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
|
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
|
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
|
cee412557a
|
moved category before fdd_code of rule in admin UI and API
|
2021-03-23 10:51:34 +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
|
5ab0f47c96
|
added last_run_datetime and next_run_datetime to rule in API
|
2021-03-22 17:29:40 +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
|
78b02c7485
|
updated README
|
2021-03-21 22:42:24 +08:00 |
|
13621160019@163.com
|
7339c996da
|
updated images in README
|
2021-03-21 13:29:32 +08:00 |
|
13621160019@163.com
|
dd29578732
|
added screenshot gif to README
|
2021-03-21 13:12:14 +08:00 |
|
13621160019@163.com
|
487aa7cbf6
|
updated README
|
2021-03-21 12:53:46 +08:00 |
|
13621160019@163.com
|
0d0d5bf52c
|
updated README
|
2021-03-21 10:47:54 +08:00 |
|
guangyuzhang
|
9e6362df25
|
added Deutsch (German) login language list in admin UI
|
2021-03-21 09:09:29 +08:00 |
|
guangyuzhang
|
214ca9f373
|
updated README
|
2021-03-20 11:01:29 +08:00 |
|
13621160019@163.com
|
007652a5a3
|
updated README
|
2021-03-19 20:12:28 +08:00 |
|
13621160019@163.com
|
42b2ba90cd
|
udpated README
|
2021-03-19 19:35:43 +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
|
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 |
|
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 |
|
YangZhang-GitHub
|
8b25860ad7
|
Modify the layout
|
2021-03-17 14:43:44 +08:00 |
|
13621160019@163.com
|
409617ff75
|
fixed headers issue of cost file in admin UI
|
2021-03-17 11:34:16 +08:00 |
|
13621160019@163.com
|
b99d251e4c
|
fixed headers issues of offline meter file and knowledge file in admin UI
|
2021-03-17 11:32:20 +08:00 |
|
13621160019@163.com
|
65a18aff97
|
updated cost file controller in admin UI
|
2021-03-16 18:39:35 +08:00 |