Commit Graph

1845 Commits (85a2728faf6c3e6b73fbd9de7564f0f944f55407)

Author SHA1 Message Date
13621160019@163.com 85a2728faf changed meter qrcode from svg to string 2022-01-12 11:58:36 +08:00
13621160019@163.com 397b54b79c Merge branch 'PR' into develop 2022-01-11 14:40:38 +08:00
13621160019@163.com 8a2f79ad4d updated README 2022-01-11 13:01:59 +08:00
Caozhenhui 1dbe058abd used bytesIO deal with qrcode 2022-01-11 10:28:28 +08:00
Caozhenhui a04ad940c8 used bytesIO deal with qrcode 2022-01-11 10:26:48 +08:00
Caozhenhui b41608aaf3 added 'qrcode' parameter to meter 2022-01-10 14:21:23 +08:00
Caozhenhui 53f76d14bf added 'qrcode' parameter to meter 2022-01-10 09:58:19 +08:00
Caozhenhui 6af787af27 added 'qrcode' parameter to meter 2022-01-10 09:55:51 +08:00
Caozhenhui a4a1cfaa2a 2022/1/10 2022-01-10 09:41:45 +08:00
13621160019@163.com 1a97d02fcd updated README 2022-01-07 21:55:16 +08:00
13621160019@163.com 3afaee3c5e Merge branch 'PR' into develop 2022-01-07 21:05:06 +08:00
tianlinzhong 0410f29889 Improved Tariff Editor2 2022-01-07 18:26:47 +08:00
tianlinzhong 2e0e7c5d93 Improved Tariff Editor 2022-01-07 17:31:31 +08:00
Caozhenhui f28431a511 2022-1-7 2022-01-07 16:31:44 +08:00
Caozhenhui b96528e70b test 2022-01-07 16:28:00 +08:00
guangyuzhang 00e30108cb updated echarts version to 5.2.2 in web ui 2022-01-05 22:44:20 +08:00
guangyuzhang 3685a06da1 Merge branch 'PR' into develop 2022-01-05 22:19:51 +08:00
13621160019@163.com 7459c37ea1 improved virtual meter editor in admin ui 2022-01-04 22:21:18 +08:00
13621160019@163.com cc5269fd18 Merge branch 'PR' into develop 2022-01-04 22:14:00 +08:00
tianlinzhong 3f096b592d Improved Virtual Meter Editor 2022-01-04 15:34:12 +08:00
Caozhenhui 827d42e898 fixed issue 183 2022-01-04 11:53:31 +08:00
Caozhenhui 4d5e58f9cf fixed issue 183 2022-01-04 11:32:28 +08:00
Caozhenhui 617c7825b4 fixed issue 183 2022-01-04 11:25:46 +08:00
13621160019@163.com 23412c2817 added docker image immigration to readme 2022-01-03 22:56:45 +08:00
13621160019@163.com f26d96d1b6 updated Dockerfiles 2022-01-02 19:30:01 +08:00
13621160019@163.com 169b09a386 updated readme 2022-01-01 18:36:14 +08:00
13621160019@163.com 35d2d7306a updated version number to v1.6.0 2021-12-31 12:47:17 +08:00
13621160019@163.com 59796fb990 Merge branch 'PR' into develop 2021-12-31 11:45:06 +08:00
tianlinzhong 60c37b7a2f Added Energy Input & Output Values to Detailed Data of CombinedEquipment Efficiency Report 2021-12-30 22:02:49 +08:00
13621160019@163.com 824be32832 Merge branch 'PR' into develop 2021-12-30 19:06:56 +08:00
Caozhenhui afd29bf8bc object_types is disabled when editing point 2021-12-30 17:00:33 +08:00
13621160019@163.com 0e01185730 added energy output and input to equipment efficiency report 2021-12-30 16:14:02 +08:00
Caozhenhui 19597adc41 added for point.object_type 2021-12-30 15:48:38 +08:00
13621160019@163.com 81d911306c Merge branch 'PR' into develop 2021-12-30 15:23:38 +08:00
13621160019@163.com 6f4184320b Merge branch 'PR' into develop 2021-12-30 14:33:37 +08:00
Caozhenhui 4777e1f275 added Is_Virtual check box is valid only for ANALOG VALUE 2021-12-30 13:17:40 +08:00
Caozhenhui 76d1a083f6 added Is_Virtual check box is valid only for ANALOG VALUE 2021-12-30 13:15:10 +08:00
13621160019@163.com 15112648cf added offline meter billing procedure to aggregation service 2021-12-29 21:57:54 +08:00
13621160019@163.com deab133f98 added virtual meter billing procedure to aggregation service 2021-12-29 21:38:39 +08:00
tianlinzhong 685a3f1dd5 Deleted console.log for the test 2021-12-29 19:03:33 +08:00
tianlinzhong 8803fc4559 Added Energy Input & Output Values to Detailed Data of Equipment Efficiency Repor 2021-12-29 18:54:00 +08:00
13621160019@163.com b4a401a1ec updated dependencies in web ui 2021-12-29 18:35:51 +08:00
13621160019@163.com 1f823647eb updated dependencies in web ui 2021-12-29 17:58:51 +08:00
13621160019@163.com 79a7227e82 updated react-countup to v6.1.0 in web ui 2021-12-29 12:24:21 +08:00
13621160019@163.com d6a7b7ad78 updated Meter RealtimeChart in web ui 2021-12-29 11:41:22 +08:00
13621160019@163.com ec7fa13f3f Merge branch 'PR' into develop 2021-12-29 10:49:03 +08:00
Caozhenhui 16bf7df2f8 fixed issue 159 2021-12-29 10:18:45 +08:00
Caozhenhui 84c01910e0 fixed issue 159 2021-12-28 21:24:09 +08:00
Caozhenhui a435fb50a6 fixed issue 159 2021-12-28 20:41:57 +08:00
13621160019@163.com a248df9006 updated web for latest Node.js version 2021-12-28 17:17:31 +08:00