13621160019@163.com
|
7404afcb67
|
fixed issue in Meter Batch Analysis Report of API
Merge branch 'develop'
|
2021-07-26 10:19:14 +08:00 |
|
13621160019@163.com
|
7b1961656e
|
fixed issue in Meter Batch Analysis Report of API
|
2021-07-26 10:18:12 +08:00 |
|
13621160019@163.com
|
b890fe99c4
|
Added Meter Batch Analysis Report to API
Merge branch 'develop'
|
2021-07-25 22:19:08 +08:00 |
|
13621160019@163.com
|
557f8f72b8
|
Added Meter Batch Analysis Report to API
Merge branch 'PR54' into develop
|
2021-07-25 22:18:06 +08:00 |
|
13621160019@163.com
|
3c3a93b693
|
added Meter Batch Analysis Report API to README
|
2021-07-25 22:17:52 +08:00 |
|
Caozhenhui
|
77231fe07e
|
modified typo
|
2021-07-23 17:28:03 +08:00 |
|
Caozhenhui
|
2da93761d6
|
Added meterbatch API
|
2021-07-23 17:24:27 +08:00 |
|
Caozhenhui
|
301c51eb5e
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-07-23 17:19:22 +08:00 |
|
13621160019@163.com
|
bfdf5d43e1
|
deleted uncessary controllers from Admin UI
Merge branch 'develop'
|
2021-07-23 16:00:06 +08:00 |
|
13621160019@163.com
|
62ccf58599
|
deleted uncessary controllers from Admin UI
|
2021-07-23 15:58:46 +08:00 |
|
Caozhenhui
|
43a21d9f49
|
Implemented the meterbatch Excel Exporter
|
2021-07-22 20:26:16 +08:00 |
|
13621160019@163.com
|
77fe4b7092
|
deleted unnecessary words in translations of Admin UI
Merge branch 'develop'
|
2021-07-21 12:34:38 +08:00 |
|
13621160019@163.com
|
56ec24c94b
|
deleted unnecessary words in translations of Admin UI
|
2021-07-21 12:27:19 +08:00 |
|
13621160019@163.com
|
5be4355e7d
|
updated README
Merge branch 'develop'
|
2021-07-21 11:17:16 +08:00 |
|
13621160019@163.com
|
af49dcdb2b
|
updated README
|
2021-07-21 11:12:10 +08:00 |
|
13621160019@163.com
|
b1e3605911
|
upgraded to v1.1.5
Merge branch 'develop'
|
2021-07-20 18:59:45 +08:00 |
|
13621160019@163.com
|
fd990f94b9
|
upgraded to v1.1.5
|
2021-07-20 18:57:27 +08:00 |
|
13621160019@163.com
|
ba834d8409
|
fixed issue of gitignore in Admin UI
Merge branch 'develop'
|
2021-07-20 18:31:09 +08:00 |
|
13621160019@163.com
|
4015e101e6
|
fixed issue of gitignore in Admin UI
|
2021-07-20 18:29:35 +08:00 |
|
13621160019@163.com
|
d4f9b5e770
|
Merge branch 'develop'
|
2021-07-20 18:07:43 +08:00 |
|
13621160019@163.com
|
e033c4eb27
|
updated upgrade1.1.4 sql
|
2021-07-20 18:06:25 +08:00 |
|
13621160019@163.com
|
f3948d2e3e
|
changed all worksheet names of excel exporters in API
Merge branch 'develop'
|
2021-07-20 17:48:16 +08:00 |
|
13621160019@163.com
|
b3451e8ff8
|
changed all worksheet names of excel exporters in API
Merge branch 'PR53' into develop
|
2021-07-20 17:43:31 +08:00 |
|
13621160019@163.com
|
89f04523f4
|
fixed warnings of excel exporters in API
|
2021-07-20 17:43:06 +08:00 |
|
13621160019@163.com
|
82551d4c53
|
changed modbus acquisition interval to 10 minutes
Merge branch 'develop'
|
2021-07-20 09:53:32 +08:00 |
|
13621160019@163.com
|
1404d6b150
|
changed modbus acquisition interval to 10 minutes
|
2021-07-20 09:52:42 +08:00 |
|
13621160019@163.com
|
7211d0f0f2
|
added Cost File to API and Admin UI and upgraded to v1.1.4
Merge branch 'develop'
|
2021-07-19 19:49:06 +08:00 |
|
13621160019@163.com
|
abb45dadbc
|
added Cost File to API and Admin UI and upgraded to v1.1.4
|
2021-07-19 19:48:00 +08:00 |
|
hyh123a
|
a57f59918c
|
modify the field to parameters
|
2021-07-19 18:18:10 +08:00 |
|
hyh123a
|
d8c26d571d
|
modify the excel title
|
2021-07-19 18:09:51 +08:00 |
|
hyh123a
|
7d7ec5d170
|
Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop
|
2021-07-19 17:43:14 +08:00 |
|
hyh123a
|
dafbe77460
|
modify the sheet title for excel
|
2021-07-19 17:43:10 +08:00 |
|
13621160019@163.com
|
dbc2eaeda1
|
added restore button to offline meter file in API and Admin UI
Merge branch 'develop'
|
2021-07-19 16:22:33 +08:00 |
|
13621160019@163.com
|
44403742a5
|
added restore button to offline meter file in API and Admin UI
|
2021-07-19 16:20:37 +08:00 |
|
13621160019@163.com
|
72fd78adf6
|
added EquipmentBatch to Web UI
Merge branch 'develop'
|
2021-07-19 15:12:53 +08:00 |
|
13621160019@163.com
|
36e31d9942
|
added EquipmentBatch to Web UI
|
2021-07-19 15:09:57 +08:00 |
|
13621160019@163.com
|
15cf01c7cc
|
added Offline Cost File actions to API
Merge branch 'develop'
|
2021-07-16 20:12:47 +08:00 |
|
13621160019@163.com
|
9443eca6f0
|
added Offline Cost File actions to API
|
2021-07-16 20:10:49 +08:00 |
|
13621160019@163.com
|
3af7296e1a
|
added Equipment Batch Analysis report API
Merge branch 'develop'
|
2021-07-16 18:59:08 +08:00 |
|
13621160019@163.com
|
00a17b0d71
|
added Equipment Batch Analysis report API
Merge branch 'PR51' into develop
|
2021-07-16 18:57:05 +08:00 |
|
13621160019@163.com
|
cdc9414c9d
|
updated README and Postman Collection for API
|
2021-07-16 18:56:55 +08:00 |
|
Caozhenhui
|
443fe4e56e
|
Implemented the equipmentbatch Excel Exporte
|
2021-07-16 12:41:29 +08:00 |
|
13621160019@163.com
|
ad9c717607
|
Merge branch 'develop'
|
2021-07-14 19:40:25 +08:00 |
|
13621160019@163.com
|
14e32e5c8c
|
Merge branch 'PR50' into develop
|
2021-07-14 19:39:29 +08:00 |
|
hyh123a
|
b4bcefab11
|
modify the pie location for child space
|
2021-07-14 10:17:56 +08:00 |
|
13621160019@163.com
|
f11516ddc9
|
fixed Child Space Share Pie issue in excel exporter of spaceenergycategory
Merge branch 'develop'
|
2021-07-13 17:49:58 +08:00 |
|
13621160019@163.com
|
65e04f21c7
|
fixed Child Space Share Pie issue in excel exporter of spaceenergycategory
Merge branch 'PR49' into develop
|
2021-07-13 17:46:22 +08:00 |
|
hyh123a
|
96a50af5c3
|
modify the spaceenergycategory for child space
|
2021-07-13 11:32:03 +08:00 |
|
13621160019@163.com
|
861b721510
|
Internationalization of Vertical Navigation Bar in Web UI
Merge branch 'develop'
|
2021-07-07 16:00:20 +08:00 |
|
13621160019@163.com
|
e20cdbe756
|
Internationalization of Vertical Navigation Bar in Web UI
Merge branch 'PR46' into develop
|
2021-07-07 15:58:43 +08:00 |