13621160019@163.com
|
227fb6b20b
|
Merge branch 'develop'
|
2022-04-09 00:30:00 +08:00 |
|
13621160019@163.com
|
f190c9d5c3
|
added length parameter to mysql substring function in myems-api
|
2022-04-09 00:28:11 +08:00 |
|
13621160019@163.com
|
7a3fbbd1a8
|
Merge branch 'develop'
|
2022-04-08 23:09:12 +08:00 |
|
13621160019@163.com
|
e4fd38b18d
|
removed cursor dictionary parameter from combinedequipment in myems-api
|
2022-04-07 22:09:33 +08:00 |
|
13621160019@163.com
|
3f99722fda
|
Merge branch 'develop'
|
2022-04-07 22:03:07 +08:00 |
|
13621160019@163.com
|
5d17818ae0
|
removed cursor dictionary parameter from combinedequipment in myems-api
|
2022-04-07 22:01:05 +08:00 |
|
13621160019@163.com
|
44f32f2c17
|
Merge branch 'develop'
|
2022-04-07 17:44:53 +08:00 |
|
13621160019@163.com
|
4ff1177ce7
|
fixed Meter list search and clear issue
|
2022-04-07 17:43:11 +08:00 |
|
13621160019@163.com
|
dcac6c5381
|
Merge branch 'PR' into develop
|
2022-04-07 17:31:20 +08:00 |
|
Caozhenhui
|
3bb4dada58
|
resolve issue I4ZNLO
|
2022-04-07 09:59:24 +08:00 |
|
Caozhenhui
|
2b6b824e0b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2022-04-07 09:38:23 +08:00 |
|
13621160019@163.com
|
3389c5ed1c
|
Merge branch 'develop'
|
2022-04-06 22:14:27 +08:00 |
|
13621160019@163.com
|
7c4f5eae1a
|
updated database demo data
|
2022-04-06 22:12:41 +08:00 |
|
Caozhenhui
|
1141fa62f4
|
resolve issue I4ZNLO
|
2022-04-06 17:11:51 +08:00 |
|
13621160019@163.com
|
23cdb1f5b3
|
Merge branch 'develop'
|
2022-04-04 19:09:04 +08:00 |
|
13621160019@163.com
|
c7f50376fd
|
added telnet to Dockerfile
|
2022-04-04 19:06:56 +08:00 |
|
13621160019@163.com
|
1bf05ecbc1
|
Merge branch 'develop'
|
2022-04-04 18:01:54 +08:00 |
|
13621160019@163.com
|
a1e894cf5f
|
added nano to Dockfile
|
2022-04-04 17:53:44 +08:00 |
|
13621160019@163.com
|
999435c853
|
Merge branch 'develop'
|
2022-04-03 09:34:37 +08:00 |
|
13621160019@163.com
|
9e1c35bcb4
|
updated docker instruction in README
|
2022-04-03 09:30:12 +08:00 |
|
13621160019@163.com
|
4219943470
|
Merge branch 'develop'
|
2022-04-03 00:18:20 +08:00 |
|
13621160019@163.com
|
47b954346a
|
updated .env path for docker run in README
|
2022-04-03 00:17:55 +08:00 |
|
13621160019@163.com
|
f019f44f5f
|
Merge branch 'develop'
|
2022-03-29 22:41:24 +08:00 |
|
13621160019@163.com
|
ccec8d98a2
|
Merge branch 'PR' into develop
|
2022-03-29 22:41:12 +08:00 |
|
13621160019@163.com
|
d825240842
|
updated Dockerfile and README of Web UI
|
2022-03-29 22:40:27 +08:00 |
|
hyh123a
|
c83ee4c4c3
|
modify the Dockerfile
|
2022-03-29 16:41:04 +08:00 |
|
13621160019@163.com
|
d17c1ddbe2
|
Merge branch 'develop'
|
2022-03-28 22:27:50 +08:00 |
|
13621160019@163.com
|
1f09369f41
|
removed dictionary parameter from cursor of combinedequipment api functions
|
2022-03-28 22:24:48 +08:00 |
|
13621160019@163.com
|
f165bb8223
|
Merge branch 'develop'
|
2022-03-27 23:03:24 +08:00 |
|
13621160019@163.com
|
43cdecd2db
|
updated database demo scripts
|
2022-03-27 23:01:33 +08:00 |
|
13621160019@163.com
|
0b6dd85ffc
|
Merge branch 'develop'
|
2022-03-27 15:27:03 +08:00 |
|
13621160019@163.com
|
23ea4dd74d
|
removed dictionary parameter from cursor in myems-normalization service
|
2022-03-27 15:18:44 +08:00 |
|
13621160019@163.com
|
7f0a230d16
|
removed dictionary parameter from cursor in myems-cleaning service
|
2022-03-27 15:15:01 +08:00 |
|
13621160019@163.com
|
8a30bcab7b
|
Merge branch 'develop'
|
2022-03-25 08:48:35 +08:00 |
|
13621160019@163.com
|
a3bd5b37ee
|
changed linechart background color when web ui is in light mode
|
2022-03-25 08:45:02 +08:00 |
|
13621160019@163.com
|
ad6827d79d
|
Merge branch 'PR' into develop
|
2022-03-25 08:36:30 +08:00 |
|
13621160019@163.com
|
70dc82fc81
|
Merge branch 'develop'
|
2022-03-24 21:18:57 +08:00 |
|
13621160019@163.com
|
c964306999
|
replaced FALSE with 0 in SQL statements
|
2022-03-24 21:17:16 +08:00 |
|
13621160019@163.com
|
301dff6f49
|
Merge branch 'develop'
|
2022-03-24 19:08:03 +08:00 |
|
13621160019@163.com
|
2533f834df
|
moved cursor.close before cnx.close in myems aggregation service
|
2022-03-24 18:48:39 +08:00 |
|
13621160019@163.com
|
06a5de2936
|
Merge branch 'develop'
|
2022-03-24 18:15:15 +08:00 |
|
13621160019@163.com
|
d881705193
|
moved cursor.close before cnx.close in myems aggregation service
|
2022-03-24 18:13:15 +08:00 |
|
13621160019@163.com
|
4d12bd4a9d
|
Merge branch 'develop'
|
2022-03-24 16:36:52 +08:00 |
|
13621160019@163.com
|
c0fb3251c9
|
replaced TRUE/FALSE with 1/0 in SQL statements in myems-aggregation service
|
2022-03-24 16:23:48 +08:00 |
|
13621160019@163.com
|
e3737c2154
|
updated example.env for myems-normalization
|
2022-03-24 16:14:46 +08:00 |
|
13621160019@163.com
|
9b43963ac3
|
replaced TRUE/FALSE with 1/0 in SQL statements in myems-normalization service
|
2022-03-24 14:18:06 +08:00 |
|
13621160019@163.com
|
10ff46bae1
|
replaced TRUE/FALSE with 1/0 in SQL statements in myems-cleaning service
|
2022-03-24 14:13:48 +08:00 |
|
13621160019@163.com
|
5c4fddb30c
|
Merge branch 'develop'
|
2022-03-23 23:09:57 +08:00 |
|
13621160019@163.com
|
bf78978032
|
fixed no such file error in admin ui
|
2022-03-23 23:03:10 +08:00 |
|
tianlinzhong
|
972a3265dd
|
Modified the background of the bright color interface curve2
|
2022-03-23 09:30:39 +08:00 |