Commit Graph

1931 Commits (efd73d962d7969cd4851cdfb2d312f29774cf56f)

Author SHA1 Message Date
13621160019@163.com efd73d962d added virtual meter carbon dioxide emssion aggregation procedure 2022-01-27 22:47:01 +08:00
13621160019@163.com 577f937fc5 updated example.env of myems-api 2022-01-26 18:19:46 +08:00
13621160019@163.com f00908f0b1 fixed issue of carbon_dioxide_emmision_factor in aggregation serivce 2022-01-26 17:37:06 +08:00
13621160019@163.com 281575a423 fixed issue of config in aggregation service 2022-01-26 16:08:52 +08:00
13621160019@163.com 912fd5b613 added meter carbon dioxide emission aggregation procedure 2022-01-25 22:40:57 +08:00
13621160019@163.com 0fb1cba06a added meter carbon dioxide emission report to api 2022-01-24 22:09:07 +08:00
13621160019@163.com 07ae3eb9ea Merge branch 'PR' into develop 2022-01-24 21:42:15 +08:00
13621160019@163.com 24a0677c40 added meter carbon dioxide emission report 2022-01-24 21:41:40 +08:00
13621160019@163.com 2d66802fa0 updated components images in docs 2022-01-24 13:39:28 +08:00
13621160019@163.com 563c5e9e7e updated architecture images in README 2022-01-24 11:33:06 +08:00
tianlinzhong 6e93bbd791 Added the interface of carbon emission analysis report of meter 2 2022-01-23 19:24:01 +08:00
13621160019@163.com 042e6f8dde fixed select statements issue in tenant reports 2022-01-21 21:07:53 +08:00
13621160019@163.com be6e74f08b fixed fraction numerator and denominator issue in combinedequipmentefficiency and equipmentefficiency reports 2022-01-21 20:36:35 +08:00
13621160019@163.com a49332e088 Merge branch 'PR' into develop 2022-01-21 19:09:47 +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
tianlinzhong 0d9b67f93c Added the interface of carbon emission analysis report of meter 2022-01-20 13:13:07 +08:00
Caozhenhui 98385b8900 added alternative parameter uuid 2022-01-19 16:49:12 +08:00
13621160019@163.com eb6bd078dd Merge branch 'master' into develop 2022-01-19 09:41:42 +08:00
13621160019@163.com 910afa03c9 added new datbase myesm_carbon_db 2022-01-19 09:41:27 +08:00
13621160019@163.com ff0105ab27 Merge branch 'develop' 2022-01-19 09:14:45 +08:00
13621160019@163.com 7a82202e44 updated README 2022-01-19 08:17:13 +08:00
13621160019@163.com e2526d2677 Merge branch 'develop' 2022-01-18 22:57:04 +08:00
13621160019@163.com 7f26b63aac upgraded version number to 1.6.1 2022-01-18 22:55:31 +08:00
13621160019@163.com fb64d8017f Merge branch 'develop' 2022-01-18 22:04:29 +08:00
13621160019@163.com 64b53ac6e0 added meteruuid as alternative parameter to meter reports 2022-01-18 21:36:11 +08:00
13621160019@163.com b8ddb9a060 Merge branch 'PR' into develop 2022-01-18 21:07:25 +08:00
Caozhenhui f3d70cf5fb added alternative parameter meter_uuid 2022-01-18 12:55:34 +08:00
13621160019@163.com 51918aff97 Merge branch 'develop' 2022-01-17 23:08:02 +08:00
13621160019@163.com 2d3ac2e7fc Merge branch 'PR' into develop 2022-01-17 23:06:56 +08:00
13621160019@163.com 54d1952cc0 added alternative parameter meter_uuid to meterenergy report 2022-01-17 23:06:46 +08:00
Caozhenhui 8c9b55b298 added 'meter_uuid' parameter 2022-01-17 20:15:43 +08:00
13621160019@163.com 222d40a6cf Merge branch 'develop' 2022-01-15 22:36:30 +08:00
13621160019@163.com 4de486ac74 Merge branch 'RP' into develop 2022-01-15 22:36:17 +08:00
13621160019@163.com f4dd0e879e Merge branch 'RP' 2022-01-15 22:35:13 +08:00
Caozhenhui 79896499cb added qrcode 2022-01-15 02:08:47 +08:00
Caozhenhui 7e674db4da adjust qrcode size 2022-01-14 00:46:10 +08:00
13621160019@163.com c413c607b9 Merge branch 'develop' 2022-01-13 22:03:46 +08:00
13621160019@163.com 0875c25f02 added QR Code for meter in Admin UI 2022-01-13 22:01:38 +08:00
13621160019@163.com cba71fc5f2 Merge branch 'PR' into develop 2022-01-13 21:30:06 +08:00
Caozhenhui 3495c41077 added qrcode 2022-01-13 17:19:52 +08:00
Caozhenhui 7278b48dbb added qrcode 2022-01-13 17:14:46 +08:00
13621160019@163.com 89d1f0abd6 Merge branch 'develop' 2022-01-13 11:22:58 +08:00
13621160019@163.com 437230107b updated docker installation in README 2022-01-13 11:21:16 +08:00
13621160019@163.com 87ad8bad93 Merge branch 'develop' 2022-01-13 10:28:40 +08:00
13621160019@163.com 63397a1eee added qrcode string to tenant, equipment, and combinedequipment in api 2022-01-13 10:05:27 +08:00
13621160019@163.com 4fe812cde2 Merge branch 'develop' 2022-01-12 22:28:16 +08:00
13621160019@163.com ec74c31b6f added qrcode in string to store in api 2022-01-12 22:26:52 +08:00
13621160019@163.com 373168933e Merge branch 'develop' 2022-01-12 21:57:24 +08:00
13621160019@163.com 064f47786d added QRCode in String to Space in API 2022-01-12 21:51:04 +08:00
13621160019@163.com c0116cbcef Merge branch 'develop' 2022-01-12 21:38:46 +08:00