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

219 Commits (cf87c7b7ec212e05f89008cb1b1f08eee42a57f3)

Author SHA1 Message Date
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 ea992ee849 updated version number to 1.7.2 2022-02-19 08:44:35 +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 05ea20416f updated version number to v1.7.1 2022-02-12 21:03:25 +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
13621160019@163.com e0f720b8e4 Bump node-sass from 6.0.1 to 7.0.0 in Web 2022-02-11 20:07:16 +08:00
13621160019@163.com 42ed405afa Merge branch 'PR' into develop 2022-02-11 16:45:51 +08:00
dependabot[bot] 32f0f85482
Bump node-sass from 6.0.1 to 7.0.0 in /web 
Bumps [node-sass](https://github.com/sass/node-sass) from 6.0.1 to 7.0.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v6.0.1...v7.0.0)

---
updated-dependencies:
- dependency-name: node-sass
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-11 04:04:12 +00: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
13621160019@163.com 225dd53330 udpated version number to v1.7.0 2022-01-28 19:14:19 +08:00
13621160019@163.com 1c724816bb added alternative uuid parameter to reports of combined equipment, equipment, meter, shopfloor, store and tenant 2022-01-21 19:09:35 +08:00
13621160019@163.com 7f26b63aac upgraded version number to 1.6.1 2022-01-18 22:55:31 +08:00
13621160019@163.com ecbebd4ea0 updated year in LICENSE 2022-01-12 12:38:31 +08:00
13621160019@163.com 1a97d02fcd updated README 2022-01-07 21:55:16 +08:00
guangyuzhang 00e30108cb updated echarts version to 5.2.2 in web ui 2022-01-05 22:44:20 +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
13621160019@163.com 23412c2817 added docker image immigration to readme 2022-01-03 22:56:45 +08:00
13621160019@163.com f26d96d1b6 updated Dockerfiles 2022-01-02 19:30:01 +08:00
13621160019@163.com 169b09a386 updated readme 2022-01-01 18:36:14 +08:00
13621160019@163.com 35d2d7306a updated version number to v1.6.0 2021-12-31 12:47:17 +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 b4a401a1ec updated dependencies in web ui 2021-12-29 18:35:51 +08:00
13621160019@163.com 1f823647eb updated dependencies in web ui 2021-12-29 17:58:51 +08:00
13621160019@163.com 79a7227e82 updated react-countup to v6.1.0 in web ui 2021-12-29 12:24:21 +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