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

408 Commits (30a026c34740cfef4a5b9adf59bceb7184325e42)

Author SHA1 Message Date
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
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
13621160019@163.com 77ba4b9233 changed float datatype to Decimal datatype for offline meter normalization 2021-03-15 19:07:49 +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 faecb1f670 fixed issue of add space in web UI 2021-03-15 14:56:22 +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 8fca486742 added Optional key to translation in admin UI 2021-03-15 13:20:11 +08:00
13621160019@163.com d61583c560 added Optional key to translation in admin UI 2021-03-15 13:14:06 +08:00
guangyuzhang fa58d71fe6 fixed typo in EquipmentEfficiency in web 2021-03-14 22:55:07 +08:00
guangyuzhang 218c7d2129 fixed issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web 2021-03-14 22:45:31 +08:00
guangyuzhang 6130609d28 fixed typo in combined equipment energy input item report in api 2021-03-14 20:06:24 +08:00
13621160019@163.com 0122ece16f fixed Cursor is not connected issues in combined equipment procedures in aggregation 2021-03-14 17:50:45 +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 0ed2ca8fc2 fixed forEach of undefined issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web 2021-03-13 19:16:58 +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 2c4271d641 added spinner and export button to combinedequipmentefficiency and equipmentefficiency in web 2021-03-13 09:01:50 +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 7d4362f586 Changed default reporting range in EnergyFlowDiagram 
Merge branch 'PR17' into develop
 2021-03-12 12:12:24 +08:00
YangZhang-GitHub cd38309ce0 The start time is changed to the beginning of last month and the end time is changed to the end of last month 2021-03-12 11:56:23 +08:00
13621160019@163.com 7eb371bf30 updated version to v1.0.8 2021-03-11 16:09:33 +08:00
13621160019@163.com 4282df55af updated excel exporter of storestatistics report 
Merge branch 'PR16' into develop
 2021-03-11 15:55:41 +08:00
Caozhenhui 34b7735161 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-11 15:47:38 +08:00
Caozhenhui e9a272a68f change line chart insertion position and delete annotation code 2021-03-11 15:47:18 +08:00
13621160019@163.com f3b62c91a7 added excel exporter of combinedequipmentstatistics report 2021-03-11 15:26:18 +08:00
13621160019@163.com fd41af641b added translation for German 2021-03-10 19:36:04 +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