Commit Graph

2195 Commits (23cdb1f5b35482eadbaee400ade866cfa609062d)

Author SHA1 Message Date
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
tianlinzhong 835235e3f9 Modified the background of the bright color interface curve 2022-03-22 21:44:36 +08:00
13621160019@163.com 849086966c Merge branch 'develop' 2022-03-21 18:12:22 +08:00
13621160019@163.com 865d9c5541 updated README 2022-03-21 18:10:19 +08:00
13621160019@163.com c1bba9eefe Merge branch 'develop' 2022-03-21 17:51:48 +08:00
13621160019@163.com f334421ac0 Merge branch 'PR' into develop 2022-03-21 17:48:06 +08:00
13621160019@163.com b012f5d866 added instruction for runing myems-api with waitress on Windows 2022-03-21 17:47:58 +08:00
gjl 6892981249
add docs/windows下运行myems-api服务. 2022-03-21 07:45:40 +00:00
13621160019@163.com 37fa888b7a Merge branch 'develop' 2022-03-20 17:04:23 +08:00
13621160019@163.com ba15b1f66e renamed index tbl_tariffs_index in database 2022-03-20 17:01:02 +08:00
13621160019@163.com e513477431 Merge branch 'develop' 2022-03-20 14:39:22 +08:00
13621160019@163.com 1fa7d67fe2 moved cnx.close after cursor.close in useractivity.write_log procedure 2022-03-20 14:33:39 +08:00
13621160019@163.com 1e80a9271d Merge branch 'develop' 2022-03-19 14:11:06 +08:00
13621160019@163.com 56588a7c0d updated upload folder path 2022-03-19 14:01:03 +08:00
13621160019@163.com 4ae6362586 Merge branch 'develop' 2022-03-17 22:54:48 +08:00