Commit Graph

574 Commits (aabdb6fb02bd22f11b2f9905743ada2ef9e03a90)

Author SHA1 Message Date
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
YangZhang-GitHub 8b25860ad7 Modify the layout 2021-03-17 14:43:44 +08:00
13621160019@163.com 182cbeaddb fixed http headers issues of offlinemeterfile, knowledgefile and costfile in admin UI
Merge branch 'develop'
2021-03-17 11:35:29 +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 e0f31a2214 Merge branch 'develop' 2021-03-17 10:47:31 +08:00
13621160019@163.com 65a18aff97 updated cost file controller in admin UI 2021-03-16 18:39:35 +08:00
YangZhang-GitHub 3d5d924d56 Modify the column width 2021-03-16 15:00:26 +08:00
13621160019@163.com af9a735cbb fixed issue when deleting offline meter file
Merge branch 'develop'
2021-03-16 12:07:24 +08:00
13621160019@163.com 82479e8b18 fixed issue when deleting offline meter file 2021-03-16 12:07:10 +08:00
13621160019@163.com a4509d5816 updated user login session expire time to 8 hours
Merge branch 'develop'
2021-03-16 12:06:07 +08:00
13621160019@163.com 45414659df updated user login session expire time to 8 hours 2021-03-16 12:05:43 +08:00
13621160019@163.com 29f7f793e7 changed float datatype to Decimal datatype for offline meter normalization
Merge branch 'develop'
2021-03-15 19:10:22 +08:00
13621160019@163.com 77ba4b9233 changed float datatype to Decimal datatype for offline meter normalization 2021-03-15 19:07:49 +08:00