Commit Graph

2083 Commits (c61b65a2d1217f670e37736ea44e6569a3a08c06)

Author SHA1 Message Date
13621160019@163.com c61b65a2d1 Merge branch 'develop' 2022-02-28 16:30:42 +08:00
13621160019@163.com 3670e48be0 replaced DateTime with DateRangePicker for Equipment reports in Web UI 2022-02-28 16:29:11 +08:00
13621160019@163.com 79ccffd79c Merge branch 'develop' 2022-02-28 15:18:58 +08:00
13621160019@163.com d870ae09fb replaced DateTime with DateRangePicker for Shopfloor reports in Web UI 2022-02-28 15:15:09 +08:00
13621160019@163.com cefd4db4bd Merge branch 'develop' 2022-02-28 14:30:47 +08:00
13621160019@163.com fca7cdcbe4 replaced DateTime with DateRangePicker for Tenant reports in Web UI 2022-02-28 14:24:28 +08:00
13621160019@163.com fd5cb9a17c Merge branch 'develop' 2022-02-27 22:49:41 +08:00
13621160019@163.com 520efe9ba7 replaced DateTime with DateRangePicker for Store reports in Web UI 2022-02-27 22:46:05 +08:00
13621160019@163.com 36ae5c3861 Merge branch 'develop' 2022-02-27 17:52:34 +08:00
13621160019@163.com b9451abfec replaced DateTime with DateRangePicker for Space reports in Web UI 2022-02-27 17:50:47 +08:00
13621160019@163.com a03059ba45 Merge branch 'develop' 2022-02-27 16:35:51 +08:00
13621160019@163.com ee2968be65 updated DateRangePicker for Meter reports in Web UI 2022-02-27 16:32:19 +08:00
13621160019@163.com f3275d64fa Merge branch 'develop' 2022-02-27 14:36:24 +08:00
13621160019@163.com afc36b98ea updated DateRangePicker for Meter reports in Web UI 2022-02-27 14:03:27 +08:00
13621160019@163.com e4db7bc446 Merge branch 'develop' 2022-02-27 11:19:08 +08:00
13621160019@163.com 7c4cd668b6 replaced DateTime with DateRangePicker for MeterSubmetersBalance report in Web UI 2022-02-27 11:10:25 +08:00
13621160019@163.com b7cb8a3751 replaced DateTime with DateRangePicker for MeterTrend report in Web UI 2022-02-26 20:05:38 +08:00
13621160019@163.com bf1f6fba88 replaced DateTime with DateRangePicker for MeterBatch report in Web UI 2022-02-26 19:56:11 +08:00
13621160019@163.com a30716552f replaced DateTime with DateRangePicker for MeterTracking report in Web UI 2022-02-26 19:40:58 +08:00
13621160019@163.com 2d30249330 Merge branch 'develop' 2022-02-26 19:17:40 +08:00
13621160019@163.com edf92a7e88 replaced DateTime with DateRangePicker for VirtualMeterCarbon report in Web UI 2022-02-26 19:15:27 +08:00
13621160019@163.com 4c9b7f7033 Merge branch 'develop' 2022-02-26 17:52:33 +08:00
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 83a1d1b8cb Merge branch 'develop' 2022-02-26 16:20:49 +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 c585a6a359 Merge branch 'develop' 2022-02-26 15:52:06 +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 82a7cee8cb Merge branch 'develop' 2022-02-26 15:32:49 +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 3ee08bf7a2 Merge branch 'develop' 2022-02-26 15:13:17 +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 8acd4eacda Merge branch 'develop' 2022-02-25 22:44:35 +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