13621160019@163.com
|
429a96c1b1
|
Merge branch 'develop'
|
2022-01-04 22:22:56 +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
|
99d9e0881b
|
Merge branch 'develop'
|
2022-01-03 23:00:06 +08:00 |
|
13621160019@163.com
|
23412c2817
|
added docker image immigration to readme
|
2022-01-03 22:56:45 +08:00 |
|
13621160019@163.com
|
7773f7ed73
|
Merge branch 'develop'
|
2022-01-02 19:31:46 +08:00 |
|
13621160019@163.com
|
f26d96d1b6
|
updated Dockerfiles
|
2022-01-02 19:30:01 +08:00 |
|
13621160019@163.com
|
5b42e40463
|
Merge branch 'develop'
|
2022-01-01 18:38:09 +08:00 |
|
13621160019@163.com
|
169b09a386
|
updated readme
|
2022-01-01 18:36:14 +08:00 |
|
13621160019@163.com
|
36ff732d43
|
Merge branch 'develop'
|
2021-12-31 12:47:28 +08:00 |
|
13621160019@163.com
|
35d2d7306a
|
updated version number to v1.6.0
|
2021-12-31 12:47:17 +08:00 |
|
13621160019@163.com
|
50cc56186d
|
Merge branch 'develop'
|
2021-12-31 12:07:33 +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
|
f443387e41
|
Merge branch 'develop'
|
2021-12-30 19:13:22 +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
|
66ce56b7c2
|
Merge branch 'develop'
|
2021-12-30 16:15:19 +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
|
283033a6c7
|
Merge branch 'develop'
|
2021-12-29 22:00:19 +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
|
c88f0620d3
|
Merge branch 'develop'
|
2021-12-29 18:38:32 +08:00 |
|
13621160019@163.com
|
b4a401a1ec
|
updated dependencies in web ui
|
2021-12-29 18:35:51 +08:00 |
|
13621160019@163.com
|
4fceb3beb5
|
Merge branch 'develop'
|
2021-12-29 18:02:47 +08:00 |
|
13621160019@163.com
|
1f823647eb
|
updated dependencies in web ui
|
2021-12-29 17:58:51 +08:00 |
|
13621160019@163.com
|
abe83be033
|
Merge branch 'develop'
|
2021-12-29 12:28:56 +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
|
f6317b2be3
|
Merge branch 'develop'
|
2021-12-29 11:43:05 +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
|
ce242594c2
|
Merge branch 'develop'
|
2021-12-28 17:20:38 +08:00 |
|
13621160019@163.com
|
a248df9006
|
updated web for latest Node.js version
|
2021-12-28 17:17:31 +08:00 |
|
13621160019@163.com
|
ffa5b9ac3a
|
Merge branch 'develop'
|
2021-12-28 14:57:46 +08:00 |
|
13621160019@163.com
|
e31307dfd9
|
added PUT actions to text/wechat/email messages in api
|
2021-12-28 14:57:22 +08:00 |
|
13621160019@163.com
|
78c2514afa
|
Merge branch 'PR' into develop
|
2021-12-28 14:21:28 +08:00 |