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

1038 Commits (7a9643aca0197ef27e9faf550d8d8543733601b9)

Author SHA1 Message Date
13621160019@163.com 670d767398 updated i18n in Web UI 
Merge branch 'develop'
 2021-06-23 21:43:28 +08:00
13621160019@163.com b69460007b updated i18n in Web UI 2021-06-23 21:42:14 +08:00
13621160019@163.com 1befd40538 added new category to FDD rule in API & Admin UI 
Merge branch 'develop'
 2021-06-17 16:07:43 +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 8581f24ca4 added data sort to FDD messages in Admin UI 
Merge branch 'develop'
 2021-06-14 15:53:14 +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
13621160019@163.com 384e73f38a fixed issue of deleting email message in Admin UI 2021-06-09 18:56:22 +08:00
13621160019@163.com fc75d93447 fixed typo for deleting email messages in Admin UI 2021-06-09 18:20:45 +08:00
13621160019@163.com ac1b94abae fixed typo for deleting email messages in Admin UI 2021-06-09 18:18:19 +08:00
13621160019@163.com 5c43b57b66 Drop table tbl_sms_recipients from myems_fdd_db 
Merge branch 'develop'
 2021-06-07 19:37:59 +08:00
13621160019@163.com 810ad931e6 Drop table tbl_sms_recipients from myems_fdd_db 2021-06-07 19:16:16 +08:00
13621160019@163.com a9b2d3c1b6 changed equipent and combined equipment associated points name to parameters name in reports API 
Merge branch 'develop'
 2021-06-01 16:40:38 +08:00
13621160019@163.com d4e4b7af3f changed equipent and combined equipment associated points name to parameters name in reports API 2021-06-01 16:39:38 +08:00
13621160019@163.com ebb18480c5 changed DataSourcePointCollection to order by ID 
Merge branch 'develop'
 2021-06-01 14:34:14 +08:00
13621160019@163.com 043dacfe24 changed GET Data Source Point Collection to order by ID 2021-06-01 14:31:08 +08:00
13621160019@163.com 3084169163 updated README 
Merge branch 'develop'
 2021-05-31 11:45:02 +08:00
13621160019@163.com 1cbba232c2 updated README 2021-05-31 11:40:53 +08:00
13621160019@163.com fb16ac888c updated README 
Merge branch 'develop'
 2021-05-31 11:17:46 +08:00
13621160019@163.com 001777ab9d udated README 2021-05-31 10:39:07 +08:00
13621160019@163.com 9eacd9ceed Merge branch 'master' into develop 2021-05-25 17:56:44 +08:00
13621160019@163.com fd8245420d updated version to v1.1.3 2021-05-25 17:55:47 +08:00
13621160019@163.com d429ba09a7 Merge branch 'master' into develop 2021-05-25 17:14:58 +08:00
13621160019@163.com db10874f19 updated version to v1.1.3 2021-05-25 17:05:59 +08:00
13621160019@163.com 53202e6369 updated Dashboard in web to display energy data of this year 
Merge branch 'develop'
 2021-05-25 16:29:41 +08:00
13621160019@163.com 50eefdb9d7 updated Dashboard in web to display energy data of this year 2021-05-25 16:26:32 +08:00
13621160019@163.com 5af58ea034 updated Dashboard in web to display energy data of this year 2021-05-25 16:26:00 +08:00
13621160019@163.com 3ed2c53c29 added recalculating scripts to database 
Merge branch 'develop'
 2021-05-25 16:10:35 +08:00
13621160019@163.com 86c3aa4c82 added recalculating scripts to database 2021-05-25 16:09:07 +08:00
13621160019@163.com 0c9521ff10 updated tbl_expressions in database 
Merge branch 'develop'
 2021-05-24 18:28:38 +08:00
13621160019@163.com dca4a6da26 updated tbl_expressions in database 2021-05-24 18:27:47 +08:00
13621160019@163.com 79490fa6b5 updated README 
Merge branch 'develop'
 2021-05-22 19:43:45 +08:00
13621160019@163.com 99245d88c5 updated README 2021-05-22 19:42:46 +08:00
13621160019@163.com 34ec8c8dba added Combined Equipment Batch Analysis report 
Merge branch 'develop'
 2021-05-21 11:40:49 +08:00
13621160019@163.com 44c0cf6b1c added Combined Equipment Batch Analysis report 
Merge branch 'PR45' into develop
 2021-05-21 11:38:34 +08:00
13621160019@163.com 6176107164 updated postman collection in API 2021-05-21 11:38:21 +08:00
YangZhang-GitHub 11e6a20b5b The CombinedEquipmentBatch page display function is completed 2021-05-20 15:49:54 +08:00
YangZhang-GitHub 676886a844 Implemented the combinedequipmentbatch Excel Exporter 2021-05-20 15:48:50 +08:00
YangZhang-GitHub 05547c42a8 The combinedequipmentbatch API has been completed 2021-05-20 15:48:17 +08:00
YangZhang-GitHub c7ed16ec00 Added combinedequipmentbatch API 2021-05-20 15:47:36 +08:00
YangZhang-GitHub b94b4c49d3 Add Combined Equipment API information to the MyEMS.postman_collection.json 2021-05-20 15:45:06 +08:00
YangZhang-GitHub f912c27299 Add Combined Equipment API information to the README 2021-05-20 15:39:46 +08:00
13621160019@163.com 386fb9f19e updated README and Postman collection in API 
Merge branch 'develop'
 2021-05-20 12:20:26 +08:00
13621160019@163.com 64aa3daf95 updated README and Postman collection in API 2021-05-20 12:19:24 +08:00