Commit Graph

114 Commits (bd91c318d85c1b22bd8dbf10909f998b74cbb682)

Author SHA1 Message Date
13621160019@163.com d2456134e9 fixed TypeError cased by undefined decimal value in Web UI 2022-02-22 17:53:38 +08:00
13621160019@163.com 37d27a1492 added Virtual Meter Carbon Dioxide Emissions Report 2022-02-20 18:22:20 +08:00
13621160019@163.com 7e5c39bae7 added Meter Carbon Dioxide Emissions Report to Web UI 2022-02-20 15:43:20 +08:00
13621160019@163.com 57c5b9bc8e updated Dashboard report in Web UI 2022-02-19 21:53:01 +08:00
13621160019@163.com f86b112c93 added DateRangePicker to MeterEnergy report in Web UI 2022-02-18 21:51:40 +08:00
Caozhenhui ffcd2df20b added rsuite/DateRangePicker to MeterEnergy 2022-02-18 20:10:57 +08:00
Caozhenhui 5ac1889af0 added rsuite/DateRangePicker to MeterEnergy 2022-02-18 20:01:12 +08:00
Caozhenhui 1488fcb646 Merge branch 'develop' of gitee.com:myems/myems into develop 2022-02-18 19:57:51 +08:00
tianlinzhong 46167e1839 fixed Web UI NotificationDown bug 2022-02-18 14:28:27 +08:00
13621160019@163.com 8ac293d4b3 added Mark All As Read action to notification 2022-02-17 18:55:31 +08:00
Caozhenhui 51ff6234a6 added DateTimeRangeContainer to MeterEnergy 2022-02-16 01:07:33 +08:00
tianlinzhong b132a3ba13 fixed Web UI Notification bug 2022-02-14 17:06:46 +08:00
Caozhenhui eda10a270c Merge branch 'develop' of gitee.com:myems/myems into develop 2022-02-14 15:04:43 +08:00
13621160019@163.com 1e652da94d updated Web Message actions in API and Notification Page in Web UI 2022-02-12 15:53:55 +08:00
13621160019@163.com 12843792f1 Merge branch 'PR' into develop 2022-02-12 14:47:23 +08:00
Caozhenhui 3dcd03218e fixed issue 192 2022-02-11 01:33:23 +08:00
Caozhenhui 154a2a859e fixed issue 192 2022-02-10 20:37:40 +08:00
Caozhenhui 3690d0e02b fixed issue 192 2022-02-10 20:36:01 +08:00
tianlinzhong af332baa3c fixed Web UI Notification Error 2022-02-09 16:08:56 +08:00
13621160019@163.com 79c76e3419 fixed issue of Notification in Web UI 2022-02-09 10:44:33 +08:00
tianlinzhong 85ceeb8648 fixed Web UI Notification 404 Error 2022-02-08 19:51:24 +08:00
Caozhenhui 6e40b42403 fixed energyflowdiagram web error 2022-02-08 14:42:53 +08:00
Caozhenhui 827d42e898 fixed issue 183 2022-01-04 11:53:31 +08:00
Caozhenhui 4d5e58f9cf fixed issue 183 2022-01-04 11:32:28 +08:00
Caozhenhui 617c7825b4 fixed issue 183 2022-01-04 11:25:46 +08:00
tianlinzhong 60c37b7a2f Added Energy Input & Output Values to Detailed Data of CombinedEquipment Efficiency Report 2021-12-30 22:02:49 +08:00
13621160019@163.com 0e01185730 added energy output and input to equipment efficiency report 2021-12-30 16:14:02 +08:00
13621160019@163.com 81d911306c Merge branch 'PR' into develop 2021-12-30 15:23:38 +08:00
tianlinzhong 685a3f1dd5 Deleted console.log for the test 2021-12-29 19:03:33 +08:00
tianlinzhong 8803fc4559 Added Energy Input & Output Values to Detailed Data of Equipment Efficiency Repor 2021-12-29 18:54:00 +08:00
13621160019@163.com 1f823647eb updated dependencies in web ui 2021-12-29 17:58:51 +08:00
13621160019@163.com d6a7b7ad78 updated Meter RealtimeChart in web ui 2021-12-29 11:41:22 +08:00
Caozhenhui 16bf7df2f8 fixed issue 159 2021-12-29 10:18:45 +08:00
Caozhenhui 84c01910e0 fixed issue 159 2021-12-28 21:24:09 +08:00
Caozhenhui a435fb50a6 fixed issue 159 2021-12-28 20:41:57 +08:00
Caozhenhui 1158bc841f solved I4ENPR 2021-12-27 17:04:40 +08:00
13621160019@163.com 5d1e469894 updated nofification(web message) in web and api 2021-12-05 22:37:59 +08:00
13621160019@163.com 4329569bb1 added notification drop down list and notification page
Merge branch 'PR78' into develop
2021-11-06 14:16:37 +08:00
tianlinzhong 4d91e63dcb solve the bug 2021-11-05 10:06:19 +08:00
13621160019@163.com df57994c7a fixed NoneType errors in detailed data formatters of Web UI 2021-11-04 22:13:22 +08:00
tianlinzhong 2bade8434f Energy management system notification function WEB UI 2021-11-02 16:02:42 +08:00
tianlinzhong c2004ca4c4 Energy management system notification function WEB UI 2021-11-02 15:35:54 +08:00
Caozhenhui 74706dcc37 added new period type 'weekly' to meterenergy in WEB UI 2021-10-29 16:14:16 +08:00
13621160019@163.com 545d16660d fixed detailed data sort issues in Web UI 2021-10-24 16:30:52 +08:00
13621160019@163.com e38126e8b0 fixed detailed data sort issues of Batch reports in Web UI 2021-10-23 20:00:17 +08:00
YangZhang-GitHub 5be1d5f72c The sorting method of detailed energy consumption data is changed from alphabetical to quantity-value 2021-10-22 17:52:06 +08:00
tianlinzhong f4166091b7 Added Associated Equpment Data to CombinedEquipmentEfficiency Report in web UI and API 2021-10-20 13:45:19 +08:00
Caozhenhui 2d91cecec9 added maximum load data 2021-10-12 14:27:37 +08:00
13621160019@163.com d678ac4149 changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime; 2021-10-11 16:53:55 +08:00
13621160019@163.com 751ad8edf1 updated demo databse for database ingestion servcie 2021-10-11 16:53:55 +08:00