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

235 Commits (e751f8364c950ba2bd07f07a976c69486b11d8c7)

Author SHA1 Message Date
13621160019@163.com e751f8364c replaced DateTime with DateRangePicker for OfflineMeterEnergy report in Web UI 2022-02-26 17:42:45 +08:00
13621160019@163.com 4daab6ea7a replaced DateTime with DateRangePicker for VirtualMeterEnergy report in Web UI 2022-02-26 17:33:55 +08:00
13621160019@163.com 90215039b9 replaced DateTime with DateRangePicker for VirtualMeterCost report in Web UI 2022-02-26 16:19:31 +08:00
13621160019@163.com d158a4de35 replaced DateTime with DateRangePicker for OfflineMeterCost report in Web UI 2022-02-26 16:07:24 +08:00
13621160019@163.com 17bf3f9a01 replaced DateTime with DateRangePicker for MeterCarbon report in Web UI 2022-02-26 15:47:29 +08:00
13621160019@163.com 447c6fa795 updated DateRangePicker for MeterEnergy report in Web UI 2022-02-26 15:26:20 +08:00
13621160019@163.com 4fc94d3712 updated DateRangePicker for MeterCost report in Web UI 2022-02-26 15:07:12 +08:00
13621160019@163.com dcf066f49b replaced datetime pickers with rsuite DateRangePicker for MeterCost report in Web UI 2022-02-25 22:40:54 +08:00
Caozhenhui 474f05c072 added DateRangePicker to MeterCost 2022-02-24 13:26:37 +08:00
13621160019@163.com b32061225d Merge branch 'PR' into develop 2022-02-23 17:58:15 +08:00
13621160019@163.com 12fc69cb24 replaced datetime pickers with rsuite DateRangePicker for MeterEnergy report in Web UI 2022-02-23 17:58:06 +08:00
Caozhenhui bfe3a43760 fixed DateRangePicker to MeterEnergy 2022-02-23 17:14:28 +08:00
Caozhenhui 0b0ca91fab fixed DateRangePicker to MeterEnergy 2022-02-23 13:43:08 +08:00
13621160019@163.com d2456134e9 fixed TypeError cased by undefined decimal value in Web UI 2022-02-22 17:53:38 +08:00
Caozhenhui 8e197d065d fixed DateRangePicker styles 2022-02-22 13:11:41 +08:00
13621160019@163.com 088bf8c607 updated README for docker 2022-02-22 11:43:57 +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 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