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

2020 Commits (474f05c072c669fac4be4d6028f6e242942190df)

Author SHA1 Message Date
Caozhenhui 474f05c072 added DateRangePicker to MeterCost 2022-02-24 13:26:37 +08:00
13621160019@163.com 8d17637cdd fixed issues in CombinedEquipmentEfficiency report and EquipmentEfficiency report 2022-02-23 22:14:08 +08:00
13621160019@163.com 8d7eea3ec2 fixed issues in CombinedEquipmentEfficiency report and EquipmentEfficiency report 2022-02-23 22:10:07 +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
13621160019@163.com 004bfeff68 added limit 1 to number of ENERGY_VALUE points of meter 2022-02-23 14:42:37 +08:00
13621160019@163.com 2f4831bbd8 added limit 1 to number of ENERGY_VALUE points of meter 2022-02-23 14:02:48 +08:00
Caozhenhui 0b0ca91fab fixed DateRangePicker to MeterEnergy 2022-02-23 13:43:08 +08:00
13621160019@163.com 2e3e38b4b3 Merge branch 'PR' into develop 2022-02-23 11:25:41 +08:00
tianlinzhong d19838fd32 fixed issues 199 -3 2022-02-23 11:07:21 +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
tianlinzhong c2f427e354 fixed issues 199 -2 2022-02-21 23:49:41 +08:00
tianlinzhong 25a9713e23 fixed issues 199 -2 2022-02-21 23:38:49 +08:00
13621160019@163.com 2b1e1bc90b updated README 2022-02-21 21:56:19 +08:00
tianlinzhong 51b9e43a04 fixed issues 199 2022-02-21 14:39:53 +08:00
13621160019@163.com ac9a4991f5 updated README 2022-02-20 18:38:42 +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 66d4490173 updated README 2022-02-19 22:14:49 +08:00
13621160019@163.com 57c5b9bc8e updated Dashboard report in Web UI 2022-02-19 21:53:01 +08:00
13621160019@163.com c198b3f992 updated changelog 2022-02-19 08:49:15 +08:00
13621160019@163.com ea992ee849 updated version number to 1.7.2 2022-02-19 08:44:35 +08:00
13621160019@163.com 03e3f563fd Merge branch 'PR' into develop 2022-02-18 21:51:55 +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
13621160019@163.com 5171f55700 Merge branch 'PR' into develop 2022-02-18 18:10:12 +08:00
tianlinzhong 46167e1839 fixed Web UI NotificationDown bug 2022-02-18 14:28:27 +08:00
13621160019@163.com ab4bb773f0 updated docker-compose guide 2022-02-18 11:56:50 +08:00
13621160019@163.com 8ac293d4b3 added Mark All As Read action to notification 2022-02-17 18:55:31 +08:00
13621160019@163.com 93f9641d8b added Mark All As Read action to notification 2022-02-17 18:54:54 +08:00
13621160019@163.com 73c5a990a9 Merge branch 'PR' into develop 2022-02-17 18:18:50 +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 df93db46b0 added default character set and collate to database 2022-02-13 20:14:13 +08:00
13621160019@163.com 05ea20416f updated version number to v1.7.1 2022-02-12 21:03:25 +08:00
13621160019@163.com bdb14ee2c0 updated POSTMAN 2022-02-12 16:00:51 +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
13621160019@163.com d4066543c3 updated database upgrade scripts 2022-02-11 16:12:17 +08:00
13621160019@163.com b721dfdd2a updated comment of tbl_web_messages in database 2022-02-11 15:07:41 +08:00
13621160019@163.com 03eb3ba94b fixed issue tbl_users in database 2022-02-11 14:58:37 +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