seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 6d35468528 updated myems aggregation service README 13621160019@163.com 2022-04-16 15:42:19 +0800
  • 56bfd7ac81 add the workflow route hyh123a 2022-04-16 15:23:50 +0800
  • 1034bc7ad9 modfiy the config to loca env hyh123a 2022-04-16 15:03:52 +0800
  • 847729068c Merge branch 'develop' 13621160019@163.com 2022-04-13 16:37:37 +0800
  • 9606d60f55 removed dictionary based cursors from api/reports 13621160019@163.com 2022-04-13 16:29:31 +0800
  • 6721a62e35 Delete the search box YangZhang-GitHub 2022-04-13 16:11:10 +0800
  • be90a24883 Merge branch 'develop' 13621160019@163.com 2022-04-13 15:11:52 +0800
  • e5a8c38ed2 removed dictionary based cursors from api/core 13621160019@163.com 2022-04-13 15:08:43 +0800
  • 168b92459f Merge branch 'develop' 13621160019@163.com 2022-04-12 22:25:33 +0800
  • 891f77b5d4 removed dictionary parameter from cursor in combined equipment api 13621160019@163.com 2022-04-12 22:22:47 +0800
  • 3065e17d66 Merge branch 'develop' 13621160019@163.com 2022-04-10 22:16:27 +0800
  • 8e7c30cafa removed ID limitation from on_delete of shopfloor api 13621160019@163.com 2022-04-10 22:15:04 +0800
  • ae2bd5ed7e fixed tuple index error in combinedequipment api 13621160019@163.com 2022-04-10 20:42:14 +0800
  • 8a59f171b0 Merge branch 'develop' 13621160019@163.com 2022-04-09 19:41:49 +0800
  • 65feff7c88 updated enterprise edition introduction 13621160019@163.com 2022-04-09 19:39:11 +0800
  • 227fb6b20b Merge branch 'develop' 13621160019@163.com 2022-04-09 00:30:00 +0800
  • f190c9d5c3 added length parameter to mysql substring function in myems-api 13621160019@163.com 2022-04-09 00:28:11 +0800
  • 7a3fbbd1a8 Merge branch 'develop' 13621160019@163.com 2022-04-08 23:09:12 +0800
  • e4fd38b18d removed cursor dictionary parameter from combinedequipment in myems-api 13621160019@163.com 2022-04-07 22:09:33 +0800
  • 3f99722fda Merge branch 'develop' 13621160019@163.com 2022-04-07 22:03:07 +0800
  • 5d17818ae0 removed cursor dictionary parameter from combinedequipment in myems-api 13621160019@163.com 2022-04-07 22:01:05 +0800
  • 44f32f2c17 Merge branch 'develop' 13621160019@163.com 2022-04-07 17:44:53 +0800
  • 4ff1177ce7 fixed Meter list search and clear issue 13621160019@163.com 2022-04-07 17:43:11 +0800
  • dcac6c5381 Merge branch 'PR' into develop 13621160019@163.com 2022-04-07 17:31:20 +0800
  • 4638f27ca6 Pre Merge pull request !139 from 曹真珲/develop 曹真珲 2022-04-07 02:00:31 +0000
  • 3bb4dada58 resolve issue I4ZNLO Caozhenhui 2022-04-07 09:59:24 +0800
  • 2b6b824e0b Merge remote-tracking branch 'upstream/develop' into develop Caozhenhui 2022-04-07 09:38:23 +0800
  • 3389c5ed1c Merge branch 'develop' 13621160019@163.com 2022-04-06 22:14:27 +0800
  • 7c4f5eae1a updated database demo data 13621160019@163.com 2022-04-06 22:12:30 +0800
  • 1141fa62f4 resolve issue I4ZNLO Caozhenhui 2022-04-06 17:11:51 +0800
  • 23cdb1f5b3 Merge branch 'develop' 13621160019@163.com 2022-04-04 19:09:04 +0800
  • c7f50376fd added telnet to Dockerfile 13621160019@163.com 2022-04-04 19:06:56 +0800
  • 1bf05ecbc1 Merge branch 'develop' 13621160019@163.com 2022-04-04 18:01:54 +0800
  • a1e894cf5f added nano to Dockfile 13621160019@163.com 2022-04-04 17:53:44 +0800
  • 999435c853 Merge branch 'develop' 13621160019@163.com 2022-04-03 09:34:37 +0800
  • 9e1c35bcb4 updated docker instruction in README 13621160019@163.com 2022-04-03 09:30:12 +0800
  • 4219943470 Merge branch 'develop' 13621160019@163.com 2022-04-03 00:18:20 +0800
  • 47b954346a updated .env path for docker run in README 13621160019@163.com 2022-04-03 00:17:55 +0800
  • 1c48edca08 Pre Merge pull request !137 from tianlinzhong/develop tianlinzhong 2022-03-29 14:42:43 +0000
  • f019f44f5f Merge branch 'develop' 13621160019@163.com 2022-03-29 22:41:24 +0800
  • ccec8d98a2 Merge branch 'PR' into develop 13621160019@163.com 2022-03-29 22:41:12 +0800
  • d825240842 updated Dockerfile and README of Web UI 13621160019@163.com 2022-03-29 22:40:27 +0800
  • 7511ca3dcb Pre Merge pull request !138 from hyh123_a/develop hyh123_a 2022-03-29 08:42:16 +0000
  • c83ee4c4c3 modify the Dockerfile hyh123a 2022-03-29 16:41:04 +0800
  • 407796ea21 Modified Meter search and meter list problems2 tianlinzhong 2022-03-29 10:06:38 +0800
  • d17c1ddbe2 Merge branch 'develop' 13621160019@163.com 2022-03-28 22:27:50 +0800
  • 1f09369f41 removed dictionary parameter from cursor of combinedequipment api functions 13621160019@163.com 2022-03-28 22:24:48 +0800
  • b415118cd5 Modified Meter search and meter list problems tianlinzhong 2022-03-28 12:02:37 +0800
  • f165bb8223 Merge branch 'develop' 13621160019@163.com 2022-03-27 23:03:24 +0800
  • 43cdecd2db updated database demo scripts 13621160019@163.com 2022-03-27 23:01:33 +0800
  • 0b6dd85ffc Merge branch 'develop' 13621160019@163.com 2022-03-27 15:27:03 +0800
  • 23ea4dd74d removed dictionary parameter from cursor in myems-normalization service 13621160019@163.com 2022-03-27 15:18:44 +0800
  • 7f0a230d16 removed dictionary parameter from cursor in myems-cleaning service 13621160019@163.com 2022-03-27 15:15:01 +0800
  • 8a30bcab7b Merge branch 'develop' 13621160019@163.com 2022-03-25 08:48:35 +0800
  • a3bd5b37ee changed linechart background color when web ui is in light mode 13621160019@163.com 2022-03-25 08:45:02 +0800
  • ad6827d79d Merge branch 'PR' into develop 13621160019@163.com 2022-03-25 08:36:30 +0800
  • 70dc82fc81 Merge branch 'develop' 13621160019@163.com 2022-03-24 21:18:57 +0800
  • 7655fc6993 Pre Merge pull request !136 from tianlinzhong/develop tianlinzhong 2022-03-24 13:17:17 +0000
  • c964306999 replaced FALSE with 0 in SQL statements 13621160019@163.com 2022-03-24 21:17:16 +0800
  • 301dff6f49 Merge branch 'develop' 13621160019@163.com 2022-03-24 19:08:03 +0800
  • 2533f834df moved cursor.close before cnx.close in myems aggregation service 13621160019@163.com 2022-03-24 18:48:39 +0800
  • 06a5de2936 Merge branch 'develop' 13621160019@163.com 2022-03-24 18:15:15 +0800
  • d881705193 moved cursor.close before cnx.close in myems aggregation service 13621160019@163.com 2022-03-24 18:13:15 +0800
  • 4d12bd4a9d Merge branch 'develop' 13621160019@163.com 2022-03-24 16:36:52 +0800
  • c0fb3251c9 replaced TRUE/FALSE with 1/0 in SQL statements in myems-aggregation service 13621160019@163.com 2022-03-24 16:23:48 +0800
  • e3737c2154 updated example.env for myems-normalization 13621160019@163.com 2022-03-24 16:14:46 +0800
  • 9b43963ac3 replaced TRUE/FALSE with 1/0 in SQL statements in myems-normalization service 13621160019@163.com 2022-03-24 14:18:06 +0800
  • 10ff46bae1 replaced TRUE/FALSE with 1/0 in SQL statements in myems-cleaning service 13621160019@163.com 2022-03-24 14:13:48 +0800
  • 5c4fddb30c Merge branch 'develop' 13621160019@163.com 2022-03-23 23:09:57 +0800
  • bf78978032 fixed no such file error in admin ui 13621160019@163.com 2022-03-23 23:03:10 +0800
  • 972a3265dd Modified the background of the bright color interface curve2 tianlinzhong 2022-03-23 09:30:39 +0800
  • 835235e3f9 Modified the background of the bright color interface curve tianlinzhong 2022-03-22 21:44:36 +0800
  • 849086966c Merge branch 'develop' 13621160019@163.com 2022-03-21 18:12:22 +0800
  • 865d9c5541 updated README 13621160019@163.com 2022-03-21 18:10:19 +0800
  • c1bba9eefe Merge branch 'develop' 13621160019@163.com 2022-03-21 17:51:48 +0800
  • f334421ac0 Merge branch 'PR' into develop 13621160019@163.com 2022-03-21 17:48:06 +0800
  • b012f5d866 added instruction for runing myems-api with waitress on Windows 13621160019@163.com 2022-03-21 17:47:58 +0800
  • 0264dcd929 Pre Merge pull request !135 from gjl/master gjl 2022-03-21 07:47:09 +0000
  • 6892981249
         add docs/windows下运行myems-api服务. gjl 2022-03-21 07:45:40 +0000
  • 37fa888b7a Merge branch 'develop' 13621160019@163.com 2022-03-20 17:04:23 +0800
  • ba15b1f66e renamed index tbl_tariffs_index in database 13621160019@163.com 2022-03-20 17:01:02 +0800
  • e513477431 Merge branch 'develop' 13621160019@163.com 2022-03-20 14:39:22 +0800
  • 1fa7d67fe2 moved cnx.close after cursor.close in useractivity.write_log procedure 13621160019@163.com 2022-03-20 14:33:39 +0800
  • 1e80a9271d Merge branch 'develop' 13621160019@163.com 2022-03-19 14:11:06 +0800
  • 56588a7c0d updated upload folder path 13621160019@163.com 2022-03-19 14:01:03 +0800
  • 4ae6362586 Merge branch 'develop' 13621160019@163.com 2022-03-17 22:54:48 +0800
  • 90e097306f updated docker compose 13621160019@163.com 2022-03-17 22:49:49 +0800
  • 914d1763fd Merge branch 'develop' 13621160019@163.com 2022-03-17 22:43:31 +0800
  • 646295363a updated nginx configs for myems-admin and myems-web 13621160019@163.com 2022-03-17 22:38:07 +0800
  • 099681b7c3 Merge branch 'develop' 13621160019@163.com 2022-03-17 22:20:31 +0800
  • 8446818f2d updated README 13621160019@163.com 2022-03-17 22:17:34 +0800
  • 8e77f15992 Merge branch 'develop' 13621160019@163.com 2022-03-17 22:10:50 +0800
  • cd937c18d8 updated README 13621160019@163.com 2022-03-17 21:56:18 +0800
  • 745601699f Merge branch 'develop' 13621160019@163.com 2022-03-17 17:49:12 +0800
  • 7bfdc57825 added column to `myems_production_db`.`tbl_teams` in database 13621160019@163.com 2022-03-17 17:45:58 +0800
  • 50132cf8c3 Merge branch 'develop' 13621160019@163.com 2022-03-17 16:51:42 +0800
  • 731c03f828 updated README 13621160019@163.com 2022-03-17 16:30:45 +0800
  • 78b573a2c7 Merge branch 'develop' 13621160019@163.com 2022-03-17 10:35:21 +0800
  • 8ff1a81b3f added myems_production_db to database 13621160019@163.com 2022-03-17 10:23:06 +0800
  • b0c68f25cf Merge branch 'develop' 13621160019@163.com 2022-03-17 09:22:40 +0800