Commit Graph

2247 Commits (ac8566bbb49e716a909013d513a8a5004d61b54f)

Author SHA1 Message Date
13621160019@163.com ff28282e6c Merge branch 'develop' 2022-03-02 13:26:11 +08:00
13621160019@163.com d597415432 updated README 2022-03-02 13:23:39 +08:00
13621160019@163.com 2ee422ac38 Merge branch 'develop' 2022-03-01 23:05:16 +08:00
13621160019@163.com bbacfdabe9 replaced DateTime with DateRangePicker for Advanced reports in Web UI 2022-03-01 23:02:46 +08:00
13621160019@163.com 235130ab64 Merge branch 'PR' into develop 2022-03-01 22:55:33 +08:00
13621160019@163.com 487ac6d1ab Merge branch 'develop' 2022-03-01 19:51:26 +08:00
13621160019@163.com 5237b27ac6 updated README 2022-03-01 19:49:24 +08:00
13621160019@163.com 6bd3476c35 Merge branch 'develop' 2022-03-01 19:41:57 +08:00
13621160019@163.com c54391d2a2 added integration testing plan to README 2022-03-01 19:39:23 +08:00
Caozhenhui 3b93db726b added DateRangePicker to AdvancedReporting 2022-03-01 14:42:06 +08:00
13621160019@163.com 13abe841f1 Merge branch 'develop' 2022-02-28 18:29:10 +08:00
13621160019@163.com d0f34a3487 updated version number to v1.8.0 2022-02-28 18:27:56 +08:00
13621160019@163.com 658db63535 Merge branch 'develop' 2022-02-28 17:18:05 +08:00
13621160019@163.com 80f3d275d6 replaced DateTime with DateRangePicker for CombinedEquipment reports in Web UI 2022-02-28 17:15:47 +08:00
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