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
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
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 fb485c0291 fixed issue of add space in web UI 
Merge branch 'develop'
 2021-03-15 14:58:44 +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 3c5253e90a changed web UI and API to set contact of space is optional 
Merge branch 'develop'
 2021-03-15 13:48:27 +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 6cbb14b03d fixed typo in EquipmentEfficiency in web 
Merge branch 'develop'
 2021-03-14 22:55:48 +08:00
guangyuzhang fa58d71fe6 fixed typo in EquipmentEfficiency in web 2021-03-14 22:55:07 +08:00
guangyuzhang 2bcd993952 fixed issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web 2021-03-14 22:47:42 +08:00
guangyuzhang 218c7d2129 fixed issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web 2021-03-14 22:45:31 +08:00
guangyuzhang 385361eadc fixed typo in combined equipment energy input item report in api 
Merge branch 'develop'
 2021-03-14 20:07:32 +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 91cb71fdfa fixed Cursor is not connected issues in combined equipment procedures in aggregation 
Merge branch 'develop'
 2021-03-14 17:51:54 +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 8fbb547efd fixed typos in combindedequipmentefficiency and equipmentefficiency report api 
Merge branch 'develop'
 2021-03-14 16:42:27 +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 4fbcf9f218 fixed forEach of undefined issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web 
Merge branch 'develop'
 2021-03-13 19:17:24 +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 dc3f7d6b8d fixed issues of historcial database close and disconnect in api 
Merge branch 'develop'
 2021-03-13 09:19:52 +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 cbb76de00f added spinner and export button to combinedequipmentefficiency and equipmentefficiency in web 
Merge branch 'develop'
 2021-03-13 09:02:20 +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 da434992a4 added cominbedequipmentefficiency report to api and web 
Merge branch 'develop'
 2021-03-13 08:22:46 +08:00
13621160019@163.com 82fb8c2e5a added cominbedequipmentefficiency report to api and web 2021-03-13 08:14:21 +08:00
13621160019@163.com 8569752dee fixed issue in eqipmentefficiency report 
Merge branch 'develop'
 2021-03-12 22:29:07 +08:00
13621160019@163.com 9f6f688cce fixed issue in eqipmentefficiency report 2021-03-12 22:28:05 +08:00
13621160019@163.com 94e9d8b7b8 added equipmentefficiency report api 
Merge branch 'develop'
 2021-03-12 20:00:25 +08:00
13621160019@163.com db6f0a4662 added equipmentefficiency report api 2021-03-12 19:59:28 +08:00
13621160019@163.com 1a7f38bd6b added historical database close and disconnect at the end of reports 
Merge branch 'develop'
 2021-03-12 14:46:29 +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 b94b5054d3 Changed default reporting range in EnergyFlowDiagram 
Merge branch 'develop'
 2021-03-12 12:14:13 +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