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

Commit Graph

  • fd4b0088dc update 特殊设备保养 lb 2023-12-18 14:25:08 +0800
  • e039a3992d Merge pull request 'projects/mesxc-zhp' (#146) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2023-12-15 16:29:57 +0800
  • c8d55ff625 解决冲突 ‘937886381’ 2023-12-15 16:28:37 +0800
  • 83fc835c51 质量管理 ‘937886381’ 2023-12-15 16:27:30 +0800
  • 165a833088 update 保养记录 lb 2023-12-14 16:58:33 +0800
  • 8d5623bb24 '1' gtz 2023-12-14 16:07:21 +0800
  • 4fa49c46ff Merge pull request 'projects/mesxc-zjl' (#145) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-14 15:55:28 +0800
  • ae251fc428 merge test juzi 2023-12-14 15:54:46 +0800
  • a2c61b86ca Merge pull request 'projects/mesxc-dy' (#144) from projects/mesxc-dy into projects/mesxc-test 高天泽 2023-12-14 15:52:47 +0800
  • 503e3442a0 merge test juzi 2023-12-14 15:51:26 +0800
  • 69a65b32ea 12.14测试bug juzi 2023-12-14 15:48:35 +0800
  • 5ac0782b36 update 设备保养监控 lb 2023-12-14 15:33:38 +0800
  • 3aec5ee86c merge helloDy 2023-12-14 14:03:53 +0800
  • 79274aa8c8 定制化报表，基础核心 helloDy 2023-12-14 14:01:19 +0800
  • 29ea06e5be Merge pull request 'projects/mesxc-zhp' (#143) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2023-12-13 17:08:40 +0800
  • f5bb5f27b4 修改 ‘937886381’ 2023-12-13 16:55:39 +0800
  • fbe8e5c023 新增报表 ‘937886381’ 2023-12-13 16:50:55 +0800
  • 46dd33cb05 update 特种设备保养 lb 2023-12-13 10:57:02 +0800
  • 68898ea67f '1' gtz 2023-12-13 09:49:02 +0800
  • 1299d72404 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test gtz 2023-12-13 09:48:44 +0800
  • 0f4bddc6d1 Merge pull request '更新成本和仓库' (#141) from projects/mesxc-zwq into projects/mesxc-test 朱文强 2023-12-13 09:19:00 +0800
  • 91d269e1ce 更新成本和仓库 zwq 2023-12-13 09:18:36 +0800
  • 4e26d49ff5 Merge pull request '首页' (#140) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-13 09:16:28 +0800
  • 63b19d84e4 首页 juzi 2023-12-13 09:12:52 +0800
  • 5f47cb131f add 添加消防设备 lb 2023-12-12 16:50:18 +0800
  • ea21f3d4bc add 安全设备，特种设备 lb 2023-12-12 16:27:37 +0800
  • bdda6c9985 add 特殊设备 lb 2023-12-12 13:57:02 +0800
  • ae83da6eb9 almost done lb 2023-12-12 11:11:10 +0800
  • 6c7390f61e Merge pull request 'projects/mesxc-zjl' (#139) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-12 10:57:12 +0800
  • 1661615af4 环保 juzi 2023-12-12 10:56:25 +0800
  • b62d0e4096 add israchart lb 2023-12-12 10:53:00 +0800
  • 1c123fa22d Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2023-12-11 10:22:51 +0800
  • 6b3619514d update 驾驶舱 lb 2023-12-11 10:21:45 +0800
  • dee9f7ce8b update lb 2023-12-11 09:47:58 +0800
  • b4d2b69004 update lb 2023-12-11 09:11:51 +0800
  • 8fdaa3e968 环保管理 juzi 2023-12-08 17:03:01 +0800
  • 54953f7bc6 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test gtz 2023-12-07 10:06:18 +0800
  • f99e979d14 '1' gtz 2023-12-07 10:06:14 +0800
  • 4f64c255af update lb 2023-12-06 15:29:11 +0800
  • cc0d3d8b75 add 烟气处理 lb 2023-12-06 10:38:56 +0800
  • f5233001e7 add Energy&Header lb 2023-12-06 10:18:12 +0800
  • f2e38b5e67 Merge pull request 'projects/mesxc-zjl' (#138) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-06 10:09:07 +0800
  • fe0c84bc3a 能源&bug juzi 2023-12-06 10:06:26 +0800
  • 7cb88fab88 add 用量统计&风机频率 lb 2023-12-06 09:47:06 +0800
  • e7263302a7 update line lb 2023-12-05 17:00:55 +0800
  • b26e1d5a7f update switcher lb 2023-12-05 15:44:22 +0800
  • 86bdabf358 update lb 2023-12-05 15:24:20 +0800
  • 4069e71477 update kiln databoard lb 2023-12-05 15:08:07 +0800
  • 0a53bcb57e merge test juzi 2023-12-05 14:40:02 +0800
  • 1ce61f13b7 原模块修改能源 juzi 2023-12-05 14:30:32 +0800
  • 6c661bedd3 add databoard lb 2023-12-04 17:00:40 +0800
  • 4e48eae2a7 修改ui ‘937886381’ 2023-12-04 14:14:34 +0800
  • 7552ad5e69 fix 添加参数 projects/mes-lb lb 2023-12-04 09:11:17 +0800
  • a2ed9ed54b fix 添加参数 lb 2023-12-04 09:10:56 +0800
  • 49d002142f Merge pull request 'projects/mesxc-dy' (#137) from projects/mesxc-dy into projects/mesxc-test 高天泽 2023-12-01 15:34:28 +0800
  • 8399081a6f Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2023-12-01 15:27:02 +0800
  • cc6c4772d3 ui helloDy 2023-12-01 15:25:46 +0800
  • ba7dad7fce Merge pull request 'projects/mesxc-dy' (#136) from projects/mesxc-dy into projects/mesxc-test 高天泽 2023-11-30 16:01:21 +0800
  • 8e7e31f918 Merge branch 'projects/mes-dy' into projects/mesxc-dy helloDy 2023-11-30 15:53:40 +0800
  • 5e4df4d849 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-30 15:06:20 +0800
  • 1d3372ed69 ui helloDy 2023-11-30 15:04:17 +0800
  • 86f246eb94 Merge pull request 'projects/mes-lb' (#134) from projects/mes-lb into projects/mes-test g7hoo 2023-11-30 14:24:09 +0800
  • e2a16332be Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-30 14:22:56 +0800
  • 69b6942f35 fix bugs lb 2023-11-30 14:19:13 +0800
  • e28cd67e20 Merge pull request 'projects/mes-test' (#133) from projects/mes-test into projects/mes projects/mes 高天泽 2023-11-30 09:11:32 +0800
  • be430ebbff Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test projects/mesxc-gtz projects/mesxc gtz 2023-11-30 09:08:59 +0800
  • eb063779b4 Merge pull request 'projects/mes-dy' (#129) from projects/mes-dy into projects/mes-test 高天泽 2023-11-30 08:58:32 +0800
  • a2672c1742 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-30 08:57:43 +0800
  • 4e97989ede Merge pull request 'projects/mes-zhp' (#131) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-30 08:54:28 +0800
  • 67200710c9 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-30 08:52:23 +0800
  • 7e2b75aaa5 Merge pull request 'projects/mes-zjl' (#130) from projects/mes-zjl into projects/mes-test juzi 2023-11-29 17:00:45 +0800
  • 8ad9b9d717 merge test juzi 2023-11-29 17:00:00 +0800
  • 3bf2757e42 班组跳转 juzi 2023-11-29 16:58:08 +0800
  • 2267444b4a Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-29 16:54:30 +0800
  • fa5a303c08 bug ui helloDy 2023-11-29 16:53:51 +0800
  • 37586a31c5 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-29 15:06:55 +0800
  • 40b023cd8d 修改bug ‘937886381’ 2023-11-29 15:06:27 +0800
  • 5dce57e4bb Merge pull request 'projects/mes-lb' (#127) from projects/mes-lb into projects/mes-test g7hoo 2023-11-29 13:41:28 +0800
  • 50a75dcb74 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-29 13:37:51 +0800
  • 9ed4c944c5 fix bugs lb 2023-11-29 13:36:53 +0800
  • 6702521f31 overwrite 产线平衡分析 lb 2023-11-29 11:34:43 +0800
  • 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 +0800
  • b0f10b9002 '1' gtz 2023-11-29 10:16:58 +0800
  • f37bba6747 Merge pull request 'projects/mes-zjl' (#126) from projects/mes-zjl into projects/mes-test juzi 2023-11-29 10:15:59 +0800
  • 365aafc21a merge test juzi 2023-11-29 10:15:08 +0800
  • de65afef11 登录页去掉验证 juzi 2023-11-29 10:12:41 +0800
  • a135877df1 Merge pull request 'projects/mes-zhp' (#125) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-29 09:06:51 +0800
  • 8d26a9e487 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-29 08:49:05 +0800
  • 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 +0800
  • 27faa04c7a 修改bug ‘937886381’ 2023-11-29 08:48:09 +0800
  • c0daa74a84 update 产线平衡分析 lb 2023-11-28 19:31:08 +0800
  • 6e7339bca3 Merge pull request 'projects/mes-dy' (#124) from projects/mes-dy into projects/mes-test 高天泽 2023-11-28 19:09:11 +0800
  • 904350a4d8 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-28 18:09:16 +0800
  • 4873f750d8 ui helloDy 2023-11-28 18:08:39 +0800
  • 13b522475e Merge pull request 'projects/mes-zjl' (#123) from projects/mes-zjl into projects/mes-test juzi 2023-11-28 16:51:59 +0800
  • 1a7e8cfc19 merge test juzi 2023-11-28 16:50:51 +0800
  • a0790a6e19 11.28 juzi 2023-11-28 16:42:40 +0800
  • b76b8f4fe9 Merge pull request 'projects/mes-lb' (#122) from projects/mes-lb into projects/mes-test g7hoo 2023-11-28 16:29:12 +0800
  • 978291e68a Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-28 16:23:20 +0800
  • a5c17d2276 fix conflicts lb 2023-11-28 16:14:24 +0800