Commit Graph

522 Commits

Author SHA1 Message Date
lb
5886875770 update 维修 2023-12-18 15:39:18 +08:00
ccb2808e60 logo 2023-12-18 15:12:17 +08:00
zwq
ef4b31fe2b 成本bug 2023-12-18 14:33:31 +08:00
zwq
20f5a0d4c7 修改成本bug 2023-12-18 14:26:23 +08:00
lb
fd4b0088dc update 特殊设备保养 2023-12-18 14:25:08 +08:00
‘937886381’
c8d55ff625 解决冲突 2023-12-15 16:28:37 +08:00
‘937886381’
83fc835c51 质量管理 2023-12-15 16:27:30 +08:00
lb
165a833088 update 保养记录 2023-12-14 16:58:33 +08:00
gtz
8d5623bb24 '1' 2023-12-14 16:07:21 +08:00
ae251fc428 merge test 2023-12-14 15:54:46 +08:00
503e3442a0 merge test 2023-12-14 15:51:26 +08:00
69a65b32ea 12.14测试bug 2023-12-14 15:48:35 +08:00
lb
5ac0782b36 update 设备保养监控 2023-12-14 15:33:38 +08:00
helloDy
3aec5ee86c merge 2023-12-14 14:03:53 +08:00
helloDy
79274aa8c8 定制化报表,基础核心 2023-12-14 14:01:19 +08:00
‘937886381’
f5bb5f27b4 修改 2023-12-13 16:55:39 +08:00
‘937886381’
fbe8e5c023 新增报表 2023-12-13 16:50:55 +08:00
lb
46dd33cb05 update 特种设备保养 2023-12-13 10:57:02 +08:00
gtz
1299d72404 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-13 09:48:44 +08:00
zwq
91d269e1ce 更新成本和仓库 2023-12-13 09:18:36 +08:00
63b19d84e4 首页 2023-12-13 09:12:52 +08:00
lb
5f47cb131f add 添加消防设备 2023-12-12 16:50:18 +08:00
lb
ea21f3d4bc add 安全设备,特种设备 2023-12-12 16:27:37 +08:00
lb
bdda6c9985 add 特殊设备 2023-12-12 13:57:02 +08:00
lb
ae83da6eb9 almost done 2023-12-12 11:29:56 +08:00
1661615af4 环保 2023-12-12 10:56:25 +08:00
lb
b62d0e4096 add israchart 2023-12-12 10:53:00 +08:00
lb
1c123fa22d Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-11 10:22:51 +08:00
lb
6b3619514d update 驾驶舱 2023-12-11 10:21:45 +08:00
lb
dee9f7ce8b update 2023-12-11 09:47:58 +08:00
lb
b4d2b69004 update 2023-12-11 09:11:51 +08:00
8fdaa3e968 环保管理 2023-12-08 17:03:01 +08:00
gtz
54953f7bc6 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-07 10:06:18 +08:00
gtz
f99e979d14 '1' 2023-12-07 10:06:14 +08:00
lb
4f64c255af update 2023-12-06 15:29:11 +08:00
lb
cc0d3d8b75 add 烟气处理 2023-12-06 10:38:56 +08:00
lb
f5233001e7 add Energy&Header 2023-12-06 10:18:12 +08:00
fe0c84bc3a 能源&bug 2023-12-06 10:06:26 +08:00
lb
7cb88fab88 add 用量统计&风机频率 2023-12-06 09:49:38 +08:00
lb
e7263302a7 update line 2023-12-05 17:00:55 +08:00
lb
b26e1d5a7f update switcher 2023-12-05 15:44:22 +08:00
lb
86bdabf358 update 2023-12-05 15:24:20 +08:00
lb
4069e71477 update kiln databoard 2023-12-05 15:08:07 +08:00
0a53bcb57e merge test 2023-12-05 14:40:02 +08:00
1ce61f13b7 原模块修改能源 2023-12-05 14:30:32 +08:00
lb
6c661bedd3 add databoard 2023-12-04 17:00:40 +08:00
‘937886381’
4e48eae2a7 修改ui 2023-12-04 14:14:34 +08:00
lb
a2ed9ed54b fix 添加参数 2023-12-04 09:10:56 +08:00
helloDy
cc6c4772d3 ui 2023-12-01 15:25:46 +08:00
helloDy
8e7e31f918 Merge branch 'projects/mes-dy' into projects/mesxc-dy 2023-11-30 15:53:40 +08:00
helloDy
5e4df4d849 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-30 15:06:20 +08:00
helloDy
1d3372ed69 ui 2023-11-30 15:04:17 +08:00
lb
e2a16332be Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-30 14:22:56 +08:00
lb
69b6942f35 fix bugs 2023-11-30 14:19:13 +08:00
gtz
be430ebbff Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-30 09:08:59 +08:00
helloDy
a2672c1742 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-30 08:57:43 +08:00
‘937886381’
67200710c9 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-30 08:52:23 +08:00
8ad9b9d717 merge test 2023-11-29 17:00:00 +08:00
3bf2757e42 班组跳转 2023-11-29 16:58:08 +08:00
helloDy
2267444b4a Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-29 16:54:30 +08:00
helloDy
fa5a303c08 bug ui 2023-11-29 16:53:51 +08:00
‘937886381’
37586a31c5 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-29 15:06:55 +08:00
‘937886381’
40b023cd8d 修改bug 2023-11-29 15:06:27 +08:00
lb
50a75dcb74 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-29 13:37:51 +08:00
lb
9ed4c944c5 fix bugs 2023-11-29 13:36:53 +08:00
lb
6702521f31 overwrite 产线平衡分析 2023-11-29 11:34:43 +08:00
gtz
61b4bf784b Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-29 10:17:02 +08:00
gtz
b0f10b9002 '1' 2023-11-29 10:16:58 +08:00
365aafc21a merge test 2023-11-29 10:15:08 +08:00
de65afef11 登录页去掉验证 2023-11-29 10:12:41 +08:00
‘937886381’
76771489da Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-29 08:48:41 +08:00
‘937886381’
27faa04c7a 修改bug 2023-11-29 08:48:09 +08:00
lb
c0daa74a84 update 产线平衡分析 2023-11-28 19:31:08 +08:00
helloDy
904350a4d8 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-28 18:09:16 +08:00
helloDy
4873f750d8 ui 2023-11-28 18:08:39 +08:00
1a7e8cfc19 merge test 2023-11-28 16:50:51 +08:00
a0790a6e19 11.28 2023-11-28 16:42:40 +08:00
lb
a5c17d2276 fix conflicts 2023-11-28 16:14:24 +08:00
lb
99f771a445 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-28 15:50:00 +08:00
lb
7201c26792 fix bugs 2023-11-28 15:46:50 +08:00
‘937886381’
6fc4794300 修改bug 2023-11-28 10:56:48 +08:00
‘937886381’
79c9f1ca66 修改bug 2023-11-28 10:54:51 +08:00
lb
57deff3875 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-28 09:06:01 +08:00
lb
68d3b46bab update process flow 2023-11-28 09:04:57 +08:00
gtz
e6b9d75f16 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-28 09:03:13 +08:00
helloDy
c76078214e Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-27 20:42:33 +08:00
helloDy
b527589e0f ui 2023-11-27 20:41:45 +08:00
lb
a18929a261 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-27 17:04:32 +08:00
669345c983 merge test 2023-11-27 16:43:15 +08:00
b86094c630 订单监控 2023-11-27 16:41:14 +08:00
lb
2fdee9cafd update 2023-11-27 15:39:30 +08:00
lb
4348d66e53 update 2023-11-27 14:40:11 +08:00
lb
76c2f50bf3 fix bugs 2023-11-27 11:31:21 +08:00
helloDy
a7f1087775 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-27 09:39:01 +08:00
helloDy
b0efd66a75 bug ui 2023-11-27 09:38:31 +08:00
gtz
d9f3434712 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-27 09:31:52 +08:00
lb
d5507ec4c0 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-24 19:15:23 +08:00
lb
8802c932e2 update 设备报警日志 2023-11-24 19:10:33 +08:00
helloDy
7f5b9d5228 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-24 19:03:48 +08:00
helloDy
9eea7e049a 部分bug 2023-11-24 19:01:25 +08:00