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

925 Commits (4015e101e6ac64553a3c9608b233adb1fc325ffb)

Author SHA1 Message Date
13621160019@163.com 4015e101e6 fixed issue of gitignore in Admin UI 2021-07-20 18:29:35 +08:00
13621160019@163.com e033c4eb27 updated upgrade1.1.4 sql 2021-07-20 18:06:25 +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 1404d6b150 changed modbus acquisition interval to 10 minutes 2021-07-20 09:52:42 +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 44403742a5 added restore button to offline meter file in API and Admin UI 2021-07-19 16:20:37 +08:00
13621160019@163.com 36e31d9942 added EquipmentBatch to Web UI 2021-07-19 15:09:57 +08:00
13621160019@163.com 9443eca6f0 added Offline Cost File actions to API 2021-07-16 20:10:49 +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 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 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 e20cdbe756 Internationalization of Vertical Navigation Bar in Web UI 
Merge branch 'PR46' into develop
 2021-07-07 15:58:43 +08:00
13621160019@163.com e0c61b1a4c added pagination to MeterRealtime in Web UI 
Merge branch 'PR47' into develop
 2021-07-07 15:40:43 +08:00
13621160019@163.com 2fdfb45bbc added pagination to MeterRealtime in Web UI 2021-07-07 15:40:20 +08:00
13621160019@163.com 9f6fa02de0 fixed wrong HTTP Status Code issues in API 2021-07-07 14:06:19 +08:00
YangZhang-GitHub abb7c6ba7f The vertical navigation bar has been internationalized 2021-07-05 17:09:34 +08:00
hyh123a f53e464f6e add the pagination for meterrealtime page 2021-07-05 16:25:21 +08:00
YangZhang-GitHub a375b5d9f6 The vertical navigation bar has been internationalized 2021-07-05 15:51:02 +08:00
YangZhang-GitHub d2afb867bd The vertical navigation bar has been internationalized 2021-07-05 15:31:31 +08:00
13621160019@163.com a648594243 updated README of Web UI 2021-07-05 14:15:15 +08:00
13621160019@163.com 8df28f4655 fixed selected meter issues in onSearchMeter of Web UI 2021-07-05 13:54:21 +08:00
13621160019@163.com ad78ba8741 added ORDER BY utc_date_time to all digital parameters data in API 2021-06-30 23:04:41 +08:00
13621160019@163.com cbc447b7e2 added ChildSpaceProportion SharePies to Space Energy Category report of Web UI 2021-06-27 10:19:31 +08:00
13621160019@163.com fc40ba1ad1 fixed base period cost units issue of Dashboard API 2021-06-26 21:43:27 +08:00
13621160019@163.com 5f603548d7 added last year data to dashboard 2021-06-26 21:21:49 +08:00
13621160019@163.com e71e0c1f22 deleted parameters data from Dashboard 2021-06-26 20:13:27 +08:00
13621160019@163.com 31509e4009 added Search Input for meters in Web UI 2021-06-26 08:06:23 +08:00
13621160019@163.com 73447386a2 upgraded Web UI library to 2.10.2 2021-06-25 09:14:11 +08:00
13621160019@163.com 0fdcec2162 upgraded Web UI library to 2.10.0 2021-06-25 08:58:12 +08:00
13621160019@163.com c2edc9a805 upgraded Web UI template to 2.9.0 2021-06-25 08:16:14 +08:00
13621160019@163.com b2c18260a9 upgraded Web UI template to 2.8.0 2021-06-24 21:54:48 +08:00
13621160019@163.com b69460007b updated i18n in Web UI 2021-06-23 21:42:14 +08:00
13621160019@163.com afc3ea98b4 added new category to FDD rule in API & Admin UI 2021-06-17 16:06:18 +08:00
13621160019@163.com 7271ae38f8 added data sort to FDD messages in Admin UI 2021-06-14 15:52:14 +08:00
13621160019@163.com cb28039fb4 Merge branch 'master' into develop 2021-06-11 17:09:49 +08:00
13621160019@163.com 1bee235c6d validate expression of rule in API 2021-06-11 17:09:36 +08:00
13621160019@163.com 4a33acbbee Merge branch 'develop' 2021-06-10 15:28:32 +08:00
13621160019@163.com 15498b705b added tbl_email_messages to myems_reporting_db 2021-06-10 14:39:01 +08:00
13621160019@163.com 2bc5ce21f9 fixed issues of deleting text message and wechat message in Admin UI 
Merge branch 'develop'
 2021-06-09 19:12:34 +08:00
13621160019@163.com c6a5ad2a7b fixed issues of deleting text message and wechat message in Admin UI 2021-06-09 19:12:17 +08:00
13621160019@163.com 2068eec2a1 fixed issue of deleting email message in Admin UI 
Merge branch 'develop'
 2021-06-09 18:56:37 +08:00