Commit Graph

2103 Commits (646295363a2b1b5608f6b06c0b8f7a92b3eb91c0)

Author SHA1 Message Date
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 dbd50f0b7a Merge branch 'PR' into develop 2022-02-25 22:41:08 +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
13621160019@163.com bb9c415d03 Merge branch 'master' into develop 2022-02-24 19:48:57 +08:00
13621160019@163.com 3b694c47c2 updated docker compose files for windows host and for linux host 2022-02-24 19:48:46 +08:00
Caozhenhui 474f05c072 added DateRangePicker to MeterCost 2022-02-24 13:26:37 +08:00
13621160019@163.com cd6d6141d2 Merge branch 'develop' 2022-02-23 22:18:19 +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 6e27e1843a Merge branch 'develop' 2022-02-23 18:02:21 +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 bd91c318d8 Merge branch 'develop' 2022-02-23 14:51:54 +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 7ec8671cf6 Merge branch 'develop' 2022-02-23 14:04:18 +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 f275b00c9e Merge branch 'develop' 2022-02-22 17:55:40 +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 ebc47a32ab Merge branch 'develop' 2022-02-22 11:45:18 +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 3f940eb05a Merge branch 'develop' 2022-02-21 22:03:18 +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 cf87c7b7ec Merge branch 'develop' 2022-02-20 18:41:10 +08:00
13621160019@163.com ac9a4991f5 updated README 2022-02-20 18:38:42 +08:00
13621160019@163.com 8d87b3625b Merge branch 'develop' 2022-02-20 18:28:23 +08:00
13621160019@163.com 37d27a1492 added Virtual Meter Carbon Dioxide Emissions Report 2022-02-20 18:22:20 +08:00
13621160019@163.com b39490fc6a Merge branch 'develop' 2022-02-20 15:44:46 +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 7b3c91d31d Merge branch 'develop' 2022-02-19 22:24:32 +08:00
13621160019@163.com 66d4490173 updated README 2022-02-19 22:14:49 +08:00
13621160019@163.com af8b8592f7 Merge branch 'develop' 2022-02-19 21:55:10 +08:00
13621160019@163.com 57c5b9bc8e updated Dashboard report in Web UI 2022-02-19 21:53:01 +08:00
13621160019@163.com 9ae2142051 Merge branch 'develop' 2022-02-19 08:49:52 +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 d710472825 Merge branch 'develop' 2022-02-18 22:02:26 +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