Commit Graph

380 Commits

Author SHA1 Message Date
‘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
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
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
b3a117f6c6 merge test 2023-11-24 17:31:21 +08:00
8929e53724 ui样式 2023-11-24 17:29:40 +08:00
lb
a8fa98cb91 update StatusAndParams 2023-11-24 14:56:17 +08:00
zwq
3e9540bcc9 更新仓库 2023-11-24 14:36:59 +08:00
zwq
601387184e 更新仓库bug 2023-11-24 14:32:58 +08:00
lb
54b63a7f53 update drawer and edit 2023-11-24 10:41:11 +08:00
helloDy
8004c85c32 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-24 09:14:32 +08:00
helloDy
9041428003 部分bug 2023-11-24 09:13:56 +08:00
lb
d79ba71bd7 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-24 08:51:18 +08:00
lb
0225be1c94 fix bugs 2023-11-23 17:07:57 +08:00
960751a264 merge test 2023-11-23 16:57:39 +08:00
978aa3a1d1 ui修改 2023-11-23 16:56:08 +08:00
zwq
8cd53915c1 修改仓库UI测试bug 2023-11-23 16:42:09 +08:00
helloDy
8dbc1d512d Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-23 15:10:26 +08:00
helloDy
8af06c6c42 bug 2023-11-23 15:09:46 +08:00
‘937886381’
afafbccc0c Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-23 14:33:32 +08:00
‘937886381’
0948737f1a 修改bug 2023-11-23 14:32:53 +08:00
lb
e318aa4f59 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-22 17:05:53 +08:00
lb
ab09a2b08c update zentao bugs 2023-11-22 17:04:22 +08:00
6940155e4f merge test 2023-11-22 17:00:32 +08:00
dfc758bfae 订单监控图 2023-11-22 16:58:32 +08:00
helloDy
5492666b53 merge 2023-11-22 14:43:07 +08:00
lb
cd55b4c860 update 2023-11-22 14:41:53 +08:00
helloDy
a7f811aa3e bug 2023-11-22 14:41:10 +08:00
lb
33188481bf update login 2023-11-22 14:27:30 +08:00
‘937886381’
a22da566c3 解决冲突 2023-11-22 14:11:23 +08:00
‘937886381’
3c99ddc4c0 修改bug 2023-11-22 14:00:02 +08:00
lb
ac28476024 update hints 2023-11-22 11:15:39 +08:00
lb
b348a31b24 update some equipment bugs 2023-11-22 10:14:40 +08:00
lb
c6d618b2b8 update bugs 2023-11-21 17:02:22 +08:00
lb
c8fb8d7589 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-21 16:08:44 +08:00
lb
51baca61cc update equipment attach process 2023-11-21 15:07:33 +08:00