Commit Graph

1129 Commits

Author SHA1 Message Date
a74242f3b3 mrege test 2023-09-20 16:59:13 +08:00
ebcf3d4d78 修改bug 2023-09-20 16:57:20 +08:00
lb
8ad84a4d61 update 设备产量时序图 2023-09-20 14:44:39 +08:00
ff9e93d264 Merge pull request 'dy' (#28) from dy into test
Reviewed-on: #28
2023-09-20 14:28:21 +08:00
lb
928258e509 update 设备状态时序图 2023-09-20 14:11:36 +08:00
helloDy
ee0affc78f Merge branch 'test' into dy 2023-09-20 13:58:36 +08:00
helloDy
dfec94be17 表格 2023-09-20 13:58:14 +08:00
lb
a12530b835 update 质量检测统计数据 2023-09-20 11:17:34 +08:00
lb
b3db8dcae8 update 检测统计数据chart 2023-09-20 10:49:17 +08:00
lb
24a0857808 update 质量检测统计数据 2023-09-20 09:50:38 +08:00
lb
e0cc022e34 update 产品质量分析样式 2023-09-20 09:11:31 +08:00
lb
71bcd14c72 update 产品质量分析chart 2023-09-19 17:06:19 +08:00
646859aeef Merge pull request '修bug' (#27) from zjl into test
Reviewed-on: #27
2023-09-19 15:47:12 +08:00
5a31498224 修bug 2023-09-19 15:45:16 +08:00
lb
c965dfbc5a bugfix 2023-09-18 17:01:44 +08:00
lb
c364162a2a update no-data-background 2023-09-18 15:14:18 +08:00
282ef45114 Merge pull request 'zjl' (#26) from zjl into test
Reviewed-on: #26
2023-09-18 14:49:52 +08:00
0371859d14 排班及bug 2023-09-18 14:49:03 +08:00
lb
7407b97f5a bugfix zentao 2023-09-18 13:52:36 +08:00
eff5e0d1e1 merge test 2023-09-18 08:50:53 +08:00
60dc449a27 排班 2023-09-18 08:41:14 +08:00
159d626b30 Merge pull request 'dy' (#25) from dy into test
Reviewed-on: #25
2023-09-16 18:00:34 +08:00
helloDy
bc5d3d44d5 页面 2023-09-16 17:51:09 +08:00
lb
a6d8a7a9da update 2023-09-15 15:45:37 +08:00
lb
7d2bfaea18 bugfix zentao 2 2023-09-15 14:49:31 +08:00
helloDy
e9538744c3 冲突 2023-09-15 14:38:43 +08:00
helloDy
8cf2f9f7e9 生产监控 2023-09-15 14:37:30 +08:00
lb
772a4b0633 bugfix zentao 1 2023-09-15 14:30:19 +08:00
lb
27ebe39a96 update image 2023-09-13 17:06:02 +08:00
zhp
97f9b52e87 Merge pull request 'zhp' (#24) from zhp into test
Reviewed-on: #24
2023-09-13 16:02:02 +08:00
‘937886381’
f85cb9c50f Merge branch 'test' into zhp 2023-09-13 16:01:18 +08:00
‘937886381’
e8cc1fc50b 生产分析 2023-09-13 16:00:43 +08:00
f08c79fc23 Merge pull request 'update router mode' (#23) from lb into test
Reviewed-on: #23
2023-09-13 12:28:57 +08:00
lb
f341ec7b30 update router mode 2023-09-13 12:24:52 +08:00
2c6a6b001c Merge pull request 'lb' (#22) from lb into test
Reviewed-on: #22
2023-09-12 11:13:59 +08:00
lb
b17bc0e162 update build:prod PUBLIC_PATH 2023-09-12 11:12:05 +08:00
lb
d595bf2660 Merge branch 'test' into lb 2023-09-12 11:10:45 +08:00
lb
529889fd07 update 工段设备绑定 dialogForm 2023-09-12 11:09:51 +08:00
lb
2f18299b0b add dialogForm of equipmentbind 2023-09-11 16:47:12 +08:00
d1c93cbf46 Merge pull request 'zhp' (#21) from zhp into test
Reviewed-on: #21
2023-09-11 16:11:04 +08:00
‘937886381’
7d959e8ad3 Merge branch 'test' into zhp 2023-09-11 16:09:42 +08:00
‘937886381’
6f0040a0ae 生产监控更新 2023-09-11 16:09:07 +08:00
347265853e Merge pull request 'dy' (#20) from dy into test
Reviewed-on: #20
2023-09-11 15:59:26 +08:00
helloDy
f1bbdf82e5 冲突 2023-09-11 15:55:58 +08:00
helloDy
645ba2843f 生产监控 2023-09-11 15:53:43 +08:00
lb
f2f3a9e850 update 设备全参数查询 2023-09-11 15:24:11 +08:00
14e06d9456 Merge pull request 'lb' (#19) from lb into test
Reviewed-on: #19
2023-09-11 15:05:16 +08:00
lb
4e05b3e3d6 merge from test 2023-09-11 15:04:16 +08:00
lb
6e678f7c68 Merge branch 'equipment-module-dev' into lb 2023-09-11 15:00:49 +08:00
lb
b91b8c3d3c update 设备加工数量 2023-09-11 14:57:55 +08:00