Commit Graph

65 Commits

Author SHA1 Message Date
lb
a5c17d2276 fix conflicts 2023-11-28 16:14:24 +08:00
lb
7201c26792 fix bugs 2023-11-28 15:46:50 +08:00
helloDy
b0efd66a75 bug ui 2023-11-27 09:38:31 +08:00
lb
0225be1c94 fix bugs 2023-11-23 17:07:57 +08:00
helloDy
1d9b97f1d0 设备信息bug 2023-11-17 10:24:53 +08:00
helloDy
3667b98da9 bug 2023-11-16 13:57:21 +08:00
helloDy
952490f0d4 24h,设备 2023-11-15 14:30:28 +08:00
helloDy
e6158cd59b merge 2023-11-11 20:51:01 +08:00
helloDy
624ed7bc27 设备管理 2023-11-11 20:49:31 +08:00
‘937886381’
a8adb317c0 质量管理 2023-11-10 17:02:52 +08:00
‘937886381’
1962ecc6df 质量管理 2023-11-07 19:10:45 +08:00
helloDy
fcb1885bf7 基础,物料,设备 2023-11-07 15:53:01 +08:00
helloDy
0ae3c66dc3 基础核心 2023-11-06 12:54:28 +08:00
lb
d25261b256 move coreEquipment 2023-10-26 15:14:00 +08:00
lb
106d0ed89c merge server 2023-10-20 17:03:06 +08:00
lb
15da20fac7 add 添加一个缓存方案 2023-10-20 14:22:46 +08:00
lb
f8baaa8955 update ui 2023-10-17 17:02:53 +08:00
lb
fe7821cbd8 update 核心模块-厂务-设备 2023-10-17 15:22:17 +08:00
lb
a7e81ad8fb Merge branch 'test' into lb 2023-10-16 17:04:34 +08:00
lb
32cbf9076f update 更新设备类型上传 2023-10-16 17:03:29 +08:00
helloDy
2b355aaf8f ui 2023-10-16 15:47:31 +08:00
lb
f60a46ed1d update 设备信息上传 2023-10-16 15:36:26 +08:00
helloDy
4a67e226e1 merge 2023-10-13 17:09:07 +08:00
helloDy
46aaa47e07 bug 2023-10-13 17:05:01 +08:00
lb
ca0f62b2eb Merge branch 'test' into lb 2023-10-13 17:04:18 +08:00
lb
5534104e87 update equipment edit 2023-10-13 17:01:49 +08:00
lb
b72fe1bfed update equipment edit 2023-10-13 16:08:31 +08:00
helloDy
d682ecc91c Merge branch 'test' into dy 2023-10-12 17:05:03 +08:00
helloDy
2b76ef7d23 bug 2023-10-12 17:04:03 +08:00
lb
9ec13b35b8 update equipment 2023-10-12 17:03:07 +08:00
lb
7acccd3de0 bugfix zentao 2023-10-12 15:40:05 +08:00
lb
8f634d012c bugfix zentao 2023-10-12 11:08:51 +08:00
lb
0162f338ba Merge branch 'test' into lb 2023-10-11 10:30:25 +08:00
helloDy
69bdab75d4 bug 2023-10-10 17:06:39 +08:00
lb
907db90e93 update 设备分组的抽屉 2023-10-09 16:27:44 +08:00
helloDy
96d52fafee pdf 2023-10-08 16:59:09 +08:00
helloDy
699810f40a Merge branch 'test' into dy 2023-09-22 16:54:40 +08:00
helloDy
d454f20bd6 bug 2023-09-22 16:54:16 +08:00
lb
ee3d6f9dc6 merge 2023-09-22 09:28:41 +08:00
helloDy
dfec94be17 表格 2023-09-20 13:58:14 +08:00
helloDy
bc5d3d44d5 页面 2023-09-16 17:51:09 +08:00
lb
a6d8a7a9da update 2023-09-15 15:45:37 +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
‘937886381’
e8cc1fc50b 生产分析 2023-09-13 16:00:43 +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
helloDy
f1bbdf82e5 冲突 2023-09-11 15:55:58 +08:00
helloDy
645ba2843f 生产监控 2023-09-11 15:53:43 +08:00