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

Commit Graph

  • 7267c2a305
         Pre Merge pull request !144 from hyh123_a/svg hyh123_a 2022-04-26 08:46:19 +0000
  • fadda60ab6 add the translation field hyh123a 2022-04-26 16:46:14 +0800
  • c0d7440cc8 modify the web code hyh123a 2022-04-26 16:45:45 +0800
  • 461a081ae7 add the admin translation hyh123a 2022-04-26 16:43:34 +0800
  • 78019e8e24 Merge branch 'develop' master 13621160019@163.com 2022-04-25 23:04:51 +0800
  • 6c07ba32b0 updated database upgrade1.4.0 sql script develop 13621160019@163.com 2022-04-25 23:01:34 +0800
  • ac8566bbb4 updated database upgrade1.4.0 sql script 13621160019@163.com 2022-04-25 22:59:04 +0800
  • 46b002aa06 Merge branch 'develop' 13621160019@163.com 2022-04-25 19:23:43 +0800
  • e01228e30e updated changelog 13621160019@163.com 2022-04-25 19:20:05 +0800
  • 973c93764d updated acquisition procedure of myems-modbus-tcp 13621160019@163.com 2022-04-25 19:17:24 +0800
  • b9bb9ad693 Merge branch 'develop' 13621160019@163.com 2022-04-25 09:48:20 +0800
  • da908b8f74 updated icons for vertical menu items 13621160019@163.com 2022-04-25 09:44:33 +0800
  • 03552606ca Merge branch 'PR' into develop 13621160019@163.com 2022-04-25 09:42:51 +0800
  • 500c69d212 delete useless img hyh123a 2022-04-24 19:22:49 +0800
  • 1942506c7e modify the i18n field hyh123a 2022-04-24 19:22:12 +0800
  • fa91142668 add the useInterval hook hyh123a 2022-04-24 19:19:30 +0800
  • fc072cf112
         Pre Merge pull request !145 from 曹真珲/develop 曹真珲 2022-04-24 08:36:13 +0000
  • 5491322bd4 modify pro to ee hyh123a 2022-04-24 16:34:30 +0800
  • d514835e08 modified myems-web icon Caozhenhui 2022-04-24 16:32:32 +0800
  • 6d9939b585 modify the svg hyh123a 2022-04-23 10:36:01 +0800
  • 4e4fffecdc modify the svg api to pro hyh123a 2022-04-23 09:39:28 +0800
  • 245a041ef6
         Pre Merge pull request !142 from hyh123_a/svg hyh123_a 2022-04-22 12:52:15 +0000
  • a9e3de7929 add the svg menu sql hyh123a 2022-04-22 20:52:09 +0800
  • 01c368900f add the judgement hyh123a 2022-04-22 20:48:16 +0800
  • d76cb1cae9 modify the config to default hyh123a 2022-04-22 20:45:41 +0800
  • 82aeb6733f add the svg table in myems_system_db hyh123a 2022-04-22 20:43:36 +0800
  • da753eaedb add the svg table in myems_system_db hyh123a 2022-04-22 20:42:53 +0800
  • 6da870c5d6 modify the page hyh123a 2022-04-22 20:40:03 +0800
  • 4639ebc6cf modify the i18 hyh123a 2022-04-22 20:38:41 +0800
  • 53d4b3dc58 complete the svg api hyh123a 2022-04-22 20:09:07 +0800
  • 513f283fa2 Merge branch 'master' into develop 13621160019@163.com 2022-04-22 17:56:20 +0800
  • d1ddb67485 added API reverse proxy in Apache conf 13621160019@163.com 2022-04-22 17:55:58 +0800
  • a4d1e9ec0d Merge branch 'PR' 13621160019@163.com 2022-04-22 17:52:57 +0800
  • 091c09fe7c
         Pre Merge pull request !143 from 曹真珲/develop 曹真珲 2022-04-22 09:31:16 +0000
  • dae6d2db2f added apache2 proxy setting Caozhenhui 2022-04-22 17:29:44 +0800
  • 28cdf06664 added apache2 proxy setting Caozhenhui 2022-04-22 16:57:56 +0800
  • 36c95f6900 modify the svg page hyh123a 2022-04-22 08:58:09 +0800
  • 1583049076 modify the base_api hyh123a 2022-04-21 20:43:11 +0800
  • 4ce0d27c63 complete the ticket agent page hyh123a 2022-04-21 20:42:55 +0800
  • 47ffd0c1d5 fixed the bug hyh123a 2022-04-21 19:32:58 +0800
  • 5746cc5a60 modify the svg hyh123a 2022-04-21 19:20:21 +0800
  • ca9f6cee96 add the svg page hyh123a 2022-04-21 16:19:46 +0800
  • dfe4ef2baf add the svg router hyh123a 2022-04-21 15:16:40 +0800
  • 946c386ff2 add the svg aapi hyh123a 2022-04-21 15:01:56 +0800
  • 715503e69e fixed the bug hyh123a 2022-04-21 14:36:15 +0800
  • 2c8c3ac0e1 complete the ticket list page hyh123a 2022-04-21 13:33:39 +0800
  • 38decf7cbb modify the ticket list api hyh123a 2022-04-21 13:33:23 +0800
  • e04b6d2634 fixed the bug hyh123a 2022-04-21 12:37:56 +0800
  • 413ce2e012 complete ticket agent page hyh123a 2022-04-21 08:58:21 +0800
  • 8c59879478 add the ticket agent's patch method hyh123a 2022-04-20 23:40:36 +0800
  • 8db72dd9b2 add the ticket patch method hyh123a 2022-04-20 23:40:05 +0800
  • 0a9d085e10 add the agent ticket api hyh123a 2022-04-20 23:24:47 +0800
  • a280523226 add the ticket agent form hyh123a 2022-04-20 23:22:08 +0800
  • d105de9167 add the ticker record button hyh123a 2022-04-20 18:25:12 +0800
  • 102feaadd3 add the ticket status api hyh123a 2022-04-20 15:58:43 +0800
  • 276be1c988 add the ticket step function hyh123a 2022-04-20 15:57:41 +0800
  • 09d20b5660
         Pre Merge pull request !141 from hyh123_a/workflow hyh123_a 2022-04-20 05:34:33 +0000
  • 2768414f81 modify the ticke application modal hyh123a 2022-04-20 13:34:26 +0800
  • 80dedacc33 modify the page hyh123a 2022-04-19 22:52:39 +0800
  • a8c474b346 complete the ticket intervention function hyh123a 2022-04-19 10:39:49 +0800
  • 07e03395f3 fixed the bug hyh123a 2022-04-19 10:13:23 +0800
  • 7988638473 fixed the bug hyh123a 2022-04-19 10:12:51 +0800
  • 5c67daed62 mdofiy the ticket route hyh123a 2022-04-18 22:12:32 +0800
  • e4f3e0d998 add the search button hyh123a 2022-04-18 22:12:09 +0800
  • d34adf3dd3 fixed the bug hyh123a 2022-04-18 21:45:14 +0800
  • b9b0264837 modify the ticket agent list api hyh123a 2022-04-18 21:40:02 +0800
  • 0aa5db7547 modify the ticket agent list api hyh123a 2022-04-18 21:39:49 +0800
  • aefe3bb3e2 add the ticket agent list api hyh123a 2022-04-18 18:14:30 +0800
  • abf7ed9fd6 modfify the ticket agent page hyh123a 2022-04-18 16:09:50 +0800
  • 2d389a3f2d add the ticket agent list api route hyh123a 2022-04-18 16:09:32 +0800
  • 45a4792730 modify the ticket application post api hyh123a 2022-04-18 15:49:15 +0800
  • 16f994323f add the application of start step hyh123a 2022-04-18 15:48:50 +0800
  • 7d98241028 Merge branch 'develop' 13621160019@163.com 2022-04-18 15:32:09 +0800
  • 6c70ad48a1 updated user insert sql statement for failed_login_count 13621160019@163.com 2022-04-18 15:22:00 +0800
  • 05bc4a4cbe add the apply page hyh123a 2022-04-18 13:01:15 +0800
  • 22ef252326 Merge branch 'develop' 13621160019@163.com 2022-04-17 22:53:05 +0800
  • 4d5a7ced33 replaced true with 1 in SQL statements of myems-api 13621160019@163.com 2022-04-17 22:49:43 +0800
  • 58e26cb5cf modify the ticket web page hyh123a 2022-04-17 21:49:36 +0800
  • f5dc197172 add the ticket apply post api hyh123a 2022-04-17 21:42:32 +0800
  • f72488e257 Merge branch 'develop' 13621160019@163.com 2022-04-17 20:20:32 +0800
  • ce1ab06770 fixed typo in virtualmetercarbon 13621160019@163.com 2022-04-17 20:17:38 +0800
  • 6d0c298923 add the ticket apply function hyh123a 2022-04-17 16:15:02 +0800
  • d2c59271a7 modify the tickect list api and page hyh123a 2022-04-17 14:53:45 +0800
  • ac26381747 add the list api hyh123a 2022-04-17 14:39:08 +0800
  • 6a1a313897 add the ticket list api hyh123a 2022-04-17 14:32:56 +0800
  • c25aaad3d0 add the ticket database config hyh123a 2022-04-16 20:43:56 +0800
  • 47d43c6792 Merge branch 'develop' v1.9.0 13621160019@163.com 2022-04-16 20:17:36 +0800
  • 05367b397c updated version number to v1.9.0 13621160019@163.com 2022-04-16 20:15:10 +0800
  • 2186e75b94 modify the ticket application page hyh123a 2022-04-16 20:05:52 +0800
  • 4414799ca2 modify the ticket type word hyh123a 2022-04-16 19:11:07 +0800
  • 823e23cdf1 add the tickets word in i18n hyh123a 2022-04-16 19:09:21 +0800
  • 1ea02fcf22 modify the route hyh123a 2022-04-16 19:01:26 +0800
  • 097aae2322 add the ticket route hyh123a 2022-04-16 18:30:41 +0800
  • 2b34801ec4 Merge branch 'develop' 13621160019@163.com 2022-04-16 17:45:23 +0800
  • 35080f0007 Removed search box from navbar of web ui 13621160019@163.com 2022-04-16 17:39:14 +0800
  • 5285ab78b3 Merge branch 'PR' into develop 13621160019@163.com 2022-04-16 17:35:32 +0800
  • 1e41040569 Merge branch 'develop' 13621160019@163.com 2022-04-16 16:20:36 +0800
  • d12044de3d
         Pre Merge pull request !140 from YangZhang-Gitee/develop YangZhang-Gitee 2022-04-16 07:44:39 +0000
  • 4f8d52331a updated web ui nginx conf 13621160019@163.com 2022-04-16 15:44:53 +0800
  • a515993039 Merge branch 'develop' 13621160019@163.com 2022-04-16 15:43:01 +0800