Caozhenhui
|
62ad53d430
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-11-02 17:03:08 +08:00 |
|
guangyuzhang
|
2671cd7f8e
|
updated dockerfiles
|
2021-11-02 16:50:54 +08:00 |
|
guangyuzhang
|
5ee5fb9fbc
|
Merge branch 'master' into develop
|
2021-11-01 14:53:01 +08:00 |
|
guangyuzhang
|
8d421975c5
|
updated Dockerfiles
|
2021-11-01 14:52:33 +08:00 |
|
Caozhenhui
|
9ea6c505a5
|
Added the time scale of weekly to all required files
|
2021-11-01 11:28:07 +08:00 |
|
Caozhenhui
|
01bce323b9
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-11-01 09:24:34 +08:00 |
|
13621160019@163.com
|
d02eef12fa
|
updated README
|
2021-10-30 19:09:22 +08:00 |
|
13621160019@163.com
|
913061987d
|
updated README
|
2021-10-30 18:53:35 +08:00 |
|
13621160019@163.com
|
eec7142bba
|
Merge branch 'develop'
|
2021-10-30 16:12:54 +08:00 |
|
13621160019@163.com
|
70151b020f
|
updated version number to v1.3.3
|
2021-10-30 16:11:12 +08:00 |
|
13621160019@163.com
|
a9a7c3989f
|
Merge branch 'develop'
|
2021-10-30 15:24:11 +08:00 |
|
13621160019@163.com
|
0d2da7535f
|
updated package.json in web ui
|
2021-10-30 15:22:36 +08:00 |
|
13621160019@163.com
|
24ec250d02
|
Merge branch 'develop'
|
2021-10-30 13:33:04 +08:00 |
|
13621160019@163.com
|
ff30e3a805
|
updated README and database test procedure
|
2021-10-30 13:30:46 +08:00 |
|
13621160019@163.com
|
658160e1be
|
updated README and database test
|
2021-10-30 12:58:29 +08:00 |
|
13621160019@163.com
|
4f4b5d52c6
|
added missing rule_id in myems_fdd_db
|
2021-10-29 17:43:57 +08:00 |
|
Caozhenhui
|
74706dcc37
|
added new period type 'weekly' to meterenergy in WEB UI
|
2021-10-29 16:14:16 +08:00 |
|
13621160019@163.com
|
98c786b5de
|
Merge branch 'develop'
|
2021-10-28 23:11:39 +08:00 |
|
13621160019@163.com
|
a5e0871def
|
added validation of offline meter hourly values to myems-normalization service
Merge branch 'PR75' into develop
|
2021-10-28 23:08:43 +08:00 |
|
13621160019@163.com
|
8d82b5e474
|
updated offline meter data template file
|
2021-10-28 23:08:16 +08:00 |
|
13621160019@163.com
|
a20932016d
|
Merge branch 'develop'
|
2021-10-28 21:54:52 +08:00 |
|
13621160019@163.com
|
f3cda07639
|
added new period type 'weekly' to meterenergy and aggregate_hourly_data_by_period in API
Merge branch 'PR76' into develop
|
2021-10-28 21:53:41 +08:00 |
|
13621160019@163.com
|
5f285d7939
|
updated commments in aggregate_hourly_data_by_period of API
|
2021-10-28 21:53:24 +08:00 |
|
13621160019@163.com
|
8353ca2b88
|
updated myems-api installation
|
2021-10-28 12:23:27 +08:00 |
|
13621160019@163.com
|
a6dd98ef26
|
Merge branch 'develop'
|
2021-10-27 18:50:09 +08:00 |
|
13621160019@163.com
|
58729e671d
|
fixed NoneType error in myems-cleaning service
|
2021-10-27 18:49:56 +08:00 |
|
Caozhenhui
|
0c1a2d9ab8
|
Modified comments
|
2021-10-27 10:05:35 +08:00 |
|
Caozhenhui
|
fedcb71d3f
|
Modified comments
|
2021-10-27 09:54:59 +08:00 |
|
Caozhenhui
|
21901667cb
|
simplified code
|
2021-10-27 09:51:34 +08:00 |
|
Caozhenhui
|
88eb2dfc07
|
simplified code
|
2021-10-27 09:29:33 +08:00 |
|
Caozhenhui
|
c8c51f7c91
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-10-27 09:28:38 +08:00 |
|
13621160019@163.com
|
adda507176
|
Merge branch 'develop'
|
2021-10-26 23:40:59 +08:00 |
|
13621160019@163.com
|
b005376841
|
updated README
|
2021-10-26 23:40:49 +08:00 |
|
13621160019@163.com
|
f8bce22ced
|
Merge branch 'develop'
|
2021-10-26 22:13:36 +08:00 |
|
13621160019@163.com
|
f0cb2128e6
|
udpated README
|
2021-10-26 22:13:27 +08:00 |
|
Caozhenhui
|
7f212e209d
|
Added the time scale of weekly to meterenergy
|
2021-10-26 19:35:10 +08:00 |
|
tianlinzhong
|
03ba920c38
|
Added verification of daily energy consumption range during offline table import
|
2021-10-26 19:29:51 +08:00 |
|
13621160019@163.com
|
4bfa882951
|
Merge branch 'develop'
|
2021-10-25 20:21:39 +08:00 |
|
13621160019@163.com
|
61deab4fa5
|
removed duplicate entry in i18n of Web UI
|
2021-10-25 20:07:32 +08:00 |
|
13621160019@163.com
|
c20600d7fe
|
removed unused import from API
|
2021-10-25 20:06:58 +08:00 |
|
13621160019@163.com
|
895f0e7e9c
|
fixed warnings in myems-aggregation service
Merge branch 'develop'
|
2021-10-24 17:48:21 +08:00 |
|
13621160019@163.com
|
04df9ac030
|
fixed warnings in myems-aggregation service
|
2021-10-24 17:47:22 +08:00 |
|
13621160019@163.com
|
02df2e3ef0
|
fixed detailed data sort issues in Web UI
Merge branch 'develop'
|
2021-10-24 16:36:33 +08:00 |
|
13621160019@163.com
|
545d16660d
|
fixed detailed data sort issues in Web UI
|
2021-10-24 16:30:52 +08:00 |
|
13621160019@163.com
|
2208d0e48f
|
fixed detailed data sort issues of Batch reports in Web UI
Merge branch 'develop'
|
2021-10-23 20:03:22 +08:00 |
|
13621160019@163.com
|
e38126e8b0
|
fixed detailed data sort issues of Batch reports in Web UI
|
2021-10-23 20:00:17 +08:00 |
|
13621160019@163.com
|
6d7a0209d6
|
fixed detailed data sort issue in StoreBatch report
Merge branch 'develop'
|
2021-10-23 17:53:10 +08:00 |
|
13621160019@163.com
|
45bb1790de
|
fixed detailed data sort issue in StoreBatch report
Merge branch 'PR74' into develop
|
2021-10-23 17:51:44 +08:00 |
|
YangZhang-GitHub
|
5be1d5f72c
|
The sorting method of detailed energy consumption data is changed from alphabetical to quantity-value
|
2021-10-22 17:52:06 +08:00 |
|
13621160019@163.com
|
fd4e8573a2
|
updated version number to v1.3.2
Merge branch 'develop'
|
2021-10-22 16:53:45 +08:00 |