Commit Graph

49 Commits

Author SHA1 Message Date
lb
9561dc27e3 fix some bugs 2023-12-20 10:26:38 +08:00
lb
5ac17b15e1 update merge 2023-12-19 09:07:19 +08:00
lb
f280a92145 merge test 2023-12-19 09:01:13 +08:00
helloDy
3aec5ee86c merge 2023-12-14 14:03:53 +08:00
helloDy
79274aa8c8 定制化报表,基础核心 2023-12-14 14:01:19 +08:00
‘937886381’
fbe8e5c023 新增报表 2023-12-13 16:50:55 +08:00
lb
ea21f3d4bc add 安全设备,特种设备 2023-12-12 16:27:37 +08:00
‘937886381’
4e48eae2a7 修改ui 2023-12-04 14:14:34 +08:00
helloDy
8e7e31f918 Merge branch 'projects/mes-dy' into projects/mesxc-dy 2023-11-30 15:53:40 +08:00
helloDy
1d3372ed69 ui 2023-11-30 15:04:17 +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
fa5a303c08 bug ui 2023-11-29 16:53:51 +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
lb
a18929a261 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-27 17:04:32 +08:00
lb
2fdee9cafd update 2023-11-27 15:39:30 +08:00
lb
76c2f50bf3 fix bugs 2023-11-27 11:31:21 +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
ab09a2b08c update zentao bugs 2023-11-22 17:04:22 +08:00
gtz
c736992a34 '1' 2023-11-22 14:49:56 +08:00
lb
b348a31b24 update some equipment bugs 2023-11-22 10:14:40 +08:00
67612c79df merge test 2023-11-14 15:47:06 +08:00
26862423c1 首页 2023-11-14 10:35:10 +08:00
helloDy
624ed7bc27 设备管理 2023-11-11 20:49:31 +08:00
lb
57a4ca96e7 add 2023-10-31 17:49:39 +08:00
lb
bacf2eab0b update 2023-10-30 10:35:09 +08:00
lb
216aa6291d update 设备管理-基础配置-设备分组绑定 2023-10-27 14:24:47 +08:00
lb
6006ae13d9 update flow 2023-10-24 11:17:07 +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
32cbf9076f update 更新设备类型上传 2023-10-16 17:03:29 +08:00
lb
8f634d012c bugfix zentao 2023-10-12 11:08:51 +08:00
lb
b2ee61b8cb update 改为抽屉展示 2023-10-10 14:22:00 +08:00
lb
907db90e93 update 设备分组的抽屉 2023-10-09 16:27:44 +08:00
lb
b23b5256f9 update 设备数据采集 2023-09-01 10:39:54 +08:00
lb
0158a11644 update 设备分析-状态时序图 2023-08-31 16:58:17 +08:00
lb
e37bb3f2ce add 设备状态时序图组件 2023-08-29 14:47:32 +08:00
lb
4ad325c02c done 设备分组报警 2023-08-28 14:56:56 +08:00
lb
9dc580ddd2 update 2023-08-28 13:30:29 +08:00
lb
573192d27a add 设备工段绑定,设备分组 2023-08-28 09:22:28 +08:00
lb
3d24159743 update 完成设备信息 2023-08-24 15:36:38 +08:00
lb
54d22292c1 update equipment drawer的逻辑 2023-08-24 11:35:51 +08:00
lb
4eb9b321db add EquipmentDrawer 2023-08-22 15:53:02 +08:00
lb
577fcb53d2 add equipment assets 2023-08-18 16:56:53 +08:00
lb
56191453af 调整目录结构,移动DialogForm组件,移动设备信息和设备类型至核心生产模块 2023-08-18 15:41:46 +08:00
01f459e811 公共样式 2023-08-03 11:18:03 +08:00
gtz
0fca3e1ec4 'init' 2023-07-26 09:54:50 +08:00