mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Commit Graph

  • 5dce57e4bb Merge pull request 'projects/mes-lb' (#127) from projects/mes-lb into projects/mes-test g7hoo 2023-11-29 13:41:28 +08:00
  • 50a75dcb74 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-29 13:37:51 +08:00
  • 9ed4c944c5 fix bugs lb 2023-11-29 13:36:53 +08:00
  • 6702521f31 overwrite 产线平衡分析 lb 2023-11-29 11:34:43 +08:00
  • 61b4bf784b Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-29 10:17:02 +08:00
  • b0f10b9002 '1' gtz 2023-11-29 10:16:58 +08:00
  • f37bba6747 Merge pull request 'projects/mes-zjl' (#126) from projects/mes-zjl into projects/mes-test juzi 2023-11-29 10:15:59 +08:00
  • 365aafc21a merge test juzi 2023-11-29 10:15:08 +08:00
  • de65afef11 登录页去掉验证 juzi 2023-11-29 10:12:41 +08:00
  • a135877df1 Merge pull request 'projects/mes-zhp' (#125) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-29 09:06:51 +08:00
  • 8d26a9e487 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-29 08:49:05 +08:00
  • 76771489da Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test ‘937886381’ 2023-11-29 08:48:41 +08:00
  • 27faa04c7a 修改bug ‘937886381’ 2023-11-29 08:48:09 +08:00
  • c0daa74a84 update 产线平衡分析 lb 2023-11-28 19:31:08 +08:00
  • 6e7339bca3 Merge pull request 'projects/mes-dy' (#124) from projects/mes-dy into projects/mes-test 高天泽 2023-11-28 19:09:11 +08:00
  • 904350a4d8 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-28 18:09:16 +08:00
  • 4873f750d8 ui helloDy 2023-11-28 18:08:39 +08:00
  • 13b522475e Merge pull request 'projects/mes-zjl' (#123) from projects/mes-zjl into projects/mes-test juzi 2023-11-28 16:51:59 +08:00
  • 1a7e8cfc19 merge test juzi 2023-11-28 16:50:51 +08:00
  • a0790a6e19 11.28 juzi 2023-11-28 16:42:40 +08:00
  • b76b8f4fe9 Merge pull request 'projects/mes-lb' (#122) from projects/mes-lb into projects/mes-test g7hoo 2023-11-28 16:29:12 +08:00
  • 978291e68a Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-28 16:23:20 +08:00
  • a5c17d2276 fix conflicts lb 2023-11-28 16:14:24 +08:00
  • a7b4e72bc2 Merge pull request 'projects/mes-lb' (#121) from projects/mes-lb into projects/mes-test g7hoo 2023-11-28 15:53:19 +08:00
  • 99f771a445 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-28 15:50:00 +08:00
  • 7201c26792 fix bugs lb 2023-11-28 15:46:50 +08:00
  • ad56aaf359 Merge pull request 'projects/mes-zhp' (#120) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-28 11:01:53 +08:00
  • 5033bbb206 解决冲突 ‘937886381’ 2023-11-28 10:59:24 +08:00
  • 6fc4794300 修改bug ‘937886381’ 2023-11-28 10:56:48 +08:00
  • 79c9f1ca66 修改bug ‘937886381’ 2023-11-28 10:54:51 +08:00
  • c74269b282 Merge pull request 'projects/mes-lb' (#119) from projects/mes-lb into projects/mes-test g7hoo 2023-11-28 09:06:58 +08:00
  • 57deff3875 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-28 09:06:01 +08:00
  • 68d3b46bab update process flow lb 2023-11-28 09:04:57 +08:00
  • e6b9d75f16 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-28 09:03:13 +08:00
  • 4323982b89 Merge pull request 'projects/mes-dy' (#118) from projects/mes-dy into projects/mes-test 高天泽 2023-11-28 09:01:37 +08:00
  • c76078214e Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-27 20:42:33 +08:00
  • b527589e0f ui helloDy 2023-11-27 20:41:45 +08:00
  • 375273419d Merge pull request 'projects/mes-lb' (#117) from projects/mes-lb into projects/mes-test g7hoo 2023-11-27 17:05:07 +08:00
  • a18929a261 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-27 17:04:32 +08:00
  • 6d465c17c2 Merge pull request 'projects/mes-zjl' (#116) from projects/mes-zjl into projects/mes-test juzi 2023-11-27 16:43:48 +08:00
  • 669345c983 merge test juzi 2023-11-27 16:43:15 +08:00
  • b86094c630 订单监控 juzi 2023-11-27 16:41:14 +08:00
  • 2fdee9cafd update lb 2023-11-27 15:25:41 +08:00
  • 4348d66e53 update lb 2023-11-27 14:40:11 +08:00
  • 76c2f50bf3 fix bugs lb 2023-11-27 11:31:21 +08:00
  • 888b5aa91f Merge pull request 'projects/mes-dy' (#115) from projects/mes-dy into projects/mes-test 高天泽 2023-11-27 09:42:54 +08:00
  • a7f1087775 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-27 09:39:01 +08:00
  • b0efd66a75 bug ui helloDy 2023-11-27 09:38:31 +08:00
  • d9f3434712 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-27 09:31:52 +08:00
  • 51f72ea5d2 Merge pull request 'projects/mes-lb' (#114) from projects/mes-lb into projects/mes-test g7hoo 2023-11-27 08:43:14 +08:00
  • d5507ec4c0 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-24 19:15:23 +08:00
  • 8802c932e2 update 设备报警日志 lb 2023-11-24 19:10:33 +08:00
  • ee26741e62 Merge pull request 'projects/mes-dy' (#113) from projects/mes-dy into projects/mes-test 高天泽 2023-11-24 19:06:04 +08:00
  • 7f5b9d5228 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-24 19:03:48 +08:00
  • 9eea7e049a 部分bug helloDy 2023-11-24 19:01:25 +08:00
  • 328b3ff560 Merge pull request 'projects/mes-zjl' (#112) from projects/mes-zjl into projects/mes-test juzi 2023-11-24 17:32:15 +08:00
  • b3a117f6c6 merge test juzi 2023-11-24 17:31:21 +08:00
  • 8929e53724 ui样式 juzi 2023-11-24 17:29:40 +08:00
  • a8fa98cb91 update StatusAndParams lb 2023-11-24 14:56:17 +08:00
  • db081c1bd1 Merge pull request '更新仓库' (#111) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-24 14:37:15 +08:00
  • 3e9540bcc9 更新仓库 zwq 2023-11-24 14:36:59 +08:00
  • 69ceadab69 Merge pull request '更新仓库bug' (#110) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-24 14:33:20 +08:00
  • 601387184e 更新仓库bug zwq 2023-11-24 14:32:58 +08:00
  • 54b63a7f53 update drawer and edit lb 2023-11-24 10:41:11 +08:00
  • b625ef0118 Merge pull request 'projects/mes-dy' (#109) from projects/mes-dy into projects/mes-test 高天泽 2023-11-24 09:19:27 +08:00
  • 8004c85c32 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-24 09:14:32 +08:00
  • 9041428003 部分bug helloDy 2023-11-24 09:13:56 +08:00
  • 39d06cd902 Merge pull request 'projects/mes-lb' (#108) from projects/mes-lb into projects/mes-test g7hoo 2023-11-24 08:56:13 +08:00
  • d79ba71bd7 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-24 08:51:18 +08:00
  • 0225be1c94 fix bugs lb 2023-11-23 17:07:57 +08:00
  • 265024d989 Merge pull request 'projects/mes-zjl' (#107) from projects/mes-zjl into projects/mes-test juzi 2023-11-23 16:58:12 +08:00
  • 960751a264 merge test juzi 2023-11-23 16:57:39 +08:00
  • 978aa3a1d1 ui修改 juzi 2023-11-23 16:56:08 +08:00
  • 2eb1afe9b2 Merge pull request '修改仓库UI测试bug' (#106) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-23 16:42:37 +08:00
  • 8cd53915c1 修改仓库UI测试bug zwq 2023-11-23 16:42:09 +08:00
  • 571d204d68 Merge pull request 'projects/mes-zhp' (#105) from projects/mes-zhp into projects/mes-test 朱文强 2023-11-23 16:41:12 +08:00
  • 8dbc1d512d Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-23 15:10:26 +08:00
  • 8af06c6c42 bug helloDy 2023-11-23 15:09:46 +08:00
  • afafbccc0c Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-23 14:33:32 +08:00
  • 0948737f1a 修改bug ‘937886381’ 2023-11-23 14:32:53 +08:00
  • 0ce6bc07a0 Merge pull request 'projects/mes-lb' (#104) from projects/mes-lb into projects/mes-test g7hoo 2023-11-22 17:09:03 +08:00
  • e318aa4f59 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-22 17:05:53 +08:00
  • ab09a2b08c update zentao bugs lb 2023-11-22 17:04:22 +08:00
  • d2d5503792 Merge pull request 'projects/mes-zjl' (#103) from projects/mes-zjl into projects/mes-test juzi 2023-11-22 17:01:21 +08:00
  • 6940155e4f merge test juzi 2023-11-22 17:00:32 +08:00
  • dfc758bfae 订单监控图 juzi 2023-11-22 16:58:32 +08:00
  • de15716b7c Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-22 14:53:49 +08:00
  • ec2994e928 Merge pull request 'projects/mes-dy' (#102) from projects/mes-dy into projects/mes-test 高天泽 2023-11-22 14:53:35 +08:00
  • c736992a34 '1' gtz 2023-11-22 14:49:56 +08:00
  • 5492666b53 merge helloDy 2023-11-22 14:43:07 +08:00
  • cd55b4c860 update lb 2023-11-22 14:41:53 +08:00
  • a7f811aa3e bug helloDy 2023-11-22 14:41:10 +08:00
  • 33188481bf update login lb 2023-11-22 14:27:30 +08:00
  • dcbb2c719b Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-22 14:15:39 +08:00
  • 0200fc08f1 Merge pull request 'projects/mes-zhp' (#101) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-22 14:14:03 +08:00
  • a22da566c3 解决冲突 ‘937886381’ 2023-11-22 14:11:23 +08:00
  • 3c99ddc4c0 修改bug ‘937886381’ 2023-11-22 14:00:02 +08:00
  • 96705bd4d9 Merge pull request 'update hints' (#100) from projects/mes-lb into projects/mes-test g7hoo 2023-11-22 13:28:39 +08:00
  • ac28476024 update hints lb 2023-11-22 11:15:39 +08:00
  • 1299a56e22 Merge pull request 'update some equipment bugs' (#99) from projects/mes-lb into projects/mes-test g7hoo 2023-11-22 10:21:55 +08:00