|
|
b4d2b69004
|
update
|
2023-12-11 09:11:51 +08:00 |
|
|
|
8fdaa3e968
|
环保管理
|
2023-12-08 17:03:01 +08:00 |
|
|
|
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 |
|
|
|
f99e979d14
|
'1'
|
2023-12-07 10:06:14 +08:00 |
|
|
|
4f64c255af
|
update
|
2023-12-06 15:29:11 +08:00 |
|
|
|
cc0d3d8b75
|
add 烟气处理
|
2023-12-06 10:38:56 +08:00 |
|
|
|
f5233001e7
|
add Energy&Header
|
2023-12-06 10:18:12 +08:00 |
|
|
|
fe0c84bc3a
|
能源&bug
|
2023-12-06 10:06:26 +08:00 |
|
|
|
7cb88fab88
|
add 用量统计&风机频率
|
2023-12-06 09:49:38 +08:00 |
|
|
|
e7263302a7
|
update line
|
2023-12-05 17:00:55 +08:00 |
|
|
|
b26e1d5a7f
|
update switcher
|
2023-12-05 15:44:22 +08:00 |
|
|
|
86bdabf358
|
update
|
2023-12-05 15:24:20 +08:00 |
|
|
|
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 |
|
|
|
6c661bedd3
|
add databoard
|
2023-12-04 17:00:40 +08:00 |
|
‘937886381’
|
4e48eae2a7
|
修改ui
|
2023-12-04 14:14:34 +08:00 |
|
|
|
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 |
|
|
|
e2a16332be
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-30 14:22:56 +08:00 |
|
|
|
69b6942f35
|
fix bugs
|
2023-11-30 14:19:13 +08:00 |
|
|
|
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 |
|
|
|
50a75dcb74
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-29 13:37:51 +08:00 |
|
|
|
9ed4c944c5
|
fix bugs
|
2023-11-29 13:36:53 +08:00 |
|
|
|
6702521f31
|
overwrite 产线平衡分析
|
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
|
2023-11-29 10:17:02 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a5c17d2276
|
fix conflicts
|
2023-11-28 16:14:24 +08:00 |
|
|
|
99f771a445
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-28 15:50:00 +08:00 |
|
|
|
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 |
|
|
|
57deff3875
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-28 09:06:01 +08:00 |
|
|
|
68d3b46bab
|
update process flow
|
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
|
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 |
|
|
|
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 |
|
|
|
2fdee9cafd
|
update
|
2023-11-27 15:39:30 +08:00 |
|
|
|
4348d66e53
|
update
|
2023-11-27 14:40:11 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d5507ec4c0
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-24 19:15:23 +08:00 |
|
|
|
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 |
|
|
|
a8fa98cb91
|
update StatusAndParams
|
2023-11-24 14:56:17 +08:00 |
|
|
|
3e9540bcc9
|
更新仓库
|
2023-11-24 14:36:59 +08:00 |
|
|
|
601387184e
|
更新仓库bug
|
2023-11-24 14:32:58 +08:00 |
|
|
|
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 |
|
|
|
d79ba71bd7
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-24 08:51:18 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e318aa4f59
|
Merge branch 'projects/mes-test' into projects/mes-lb
|
2023-11-22 17:05:53 +08:00 |
|
|
|
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 |
|
|
|
de15716b7c
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-22 14:53:49 +08:00 |
|
|
|
c736992a34
|
'1'
|
2023-11-22 14:49:56 +08:00 |
|
helloDy
|
5492666b53
|
merge
|
2023-11-22 14:43:07 +08:00 |
|
|
|
cd55b4c860
|
update
|
2023-11-22 14:41:53 +08:00 |
|
helloDy
|
a7f811aa3e
|
bug
|
2023-11-22 14:41:10 +08:00 |
|
|
|
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 |
|
|
|
ac28476024
|
update hints
|
2023-11-22 11:15:39 +08:00 |
|
