Commit Graph

813 Commits

Author SHA1 Message Date
lb
8abe75a9b9 update待确认巡检单 2024-02-27 15:55:52 +08:00
helloDy
85791cc10c Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-27 09:23:00 +08:00
helloDy
ef740fec27 设备保养设备巡检 2024-02-27 09:22:03 +08:00
a8013fce87 merge test 2024-02-27 09:14:10 +08:00
65e2f9ed6a 订单bug修改 2024-02-27 09:12:17 +08:00
lb
6d3b41a394 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-26 17:06:19 +08:00
3e89f4066f 订单bug 2024-02-26 13:18:21 +08:00
c5925e54cd merge test 2024-02-26 10:45:48 +08:00
lb
512986faf6 fix navbar right 2024-02-26 10:28:16 +08:00
b08639f15c merge test 2024-02-26 10:19:35 +08:00
9a807ff798 能源bug修改 2024-02-26 10:15:56 +08:00
helloDy
7da93bbca0 merge 2024-02-26 08:46:18 +08:00
helloDy
0abf628377 设备 2024-02-26 08:44:42 +08:00
helloDy
35da704bb4 设备保养 2024-02-24 19:18:11 +08:00
lb
2997f4b7b9 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-23 17:15:56 +08:00
lb
4316e7f37f merge & delete yarn.lock 2024-02-23 17:14:28 +08:00
842b863561 merge test 2024-02-23 17:11:24 +08:00
lb
89e86c31bb update 巡检记录 2024-02-23 17:03:55 +08:00
71fc98b0bb 订单管理 2024-02-23 17:01:48 +08:00
lb
15738642b0 update 2024-02-23 16:32:01 +08:00
‘937886381’
81c1f2c571 xiugaibug 2024-02-23 16:12:43 +08:00
‘937886381’
a6f7bb2f2d 解决冲突 2024-02-23 16:04:05 +08:00
‘937886381’
05b513a862 修改 2024-02-23 16:02:55 +08:00
lb
f72cd9d68e update 待确认 2024-02-23 15:11:36 +08:00
lb
99b225e3dc update 巡检待确认 2024-02-23 11:20:04 +08:00
lb
4d1b72fae7 update 巡检待确认 2024-02-23 09:45:43 +08:00
lb
67a76869e1 update 巡检单待确认 2024-02-22 16:52:07 +08:00
lb
ca2774ca28 update navbar user dept 2024-02-22 16:23:19 +08:00
lb
1dd7fef171 update 巡检待确认 2024-02-22 16:19:02 +08:00
lb
9ad83f84fa update 巡检单设置 2024-02-22 16:11:30 +08:00
lb
ef354732b4 update 巡检单设置 2024-02-22 11:21:59 +08:00
helloDy
ff19047729 merge 2024-02-21 18:47:46 +08:00
helloDy
ea7c419c6f 基础核心,设备基础 2024-02-21 18:39:48 +08:00
lb
95a4b336f8 update 2024-02-21 16:55:35 +08:00
lb
ed65bd7f30 update check record 2024-02-21 16:39:43 +08:00
lb
5b40c3972c update repair detail 2024-02-21 15:51:59 +08:00
‘937886381’
d3b87e4051 解决冲突 2024-02-21 15:28:15 +08:00
‘937886381’
03ee5e1037 修改bug 2024-02-21 15:27:09 +08:00
lb
f8c2889abc update repair 2024-02-21 14:44:15 +08:00
lb
eb0445f479 update 特种设备维修 2024-02-20 17:00:56 +08:00
lb
9f8d604456 done 保养模块 2024-02-20 15:53:31 +08:00
lb
d5551eabb8 update 保养记录详情 2024-02-20 15:14:31 +08:00
lb
8ca1ef5624 update maintain 2024-02-20 14:38:55 +08:00
lb
564a4a42d2 update waitinglist unplanned--edit 2024-02-19 16:57:22 +08:00
lb
8e081342f0 init waitinglist unplanned edit drawer 2024-02-19 15:29:55 +08:00
lb
874e36eb50 update waiting list 2024-02-19 11:27:23 +08:00
lb
66337f4aca update waitinglist table 2024-02-19 11:11:09 +08:00
lb
ade0f6745e update special equipment basic pages 2024-02-19 09:41:10 +08:00
zwq
8b88d6a9b9 修改成本-仓库parseInt 2024-02-19 09:40:23 +08:00
gtz
b672d0ff57 'del_tenantName' 2024-02-19 09:08:17 +08:00
gtz
b0e38a378b 'del_parseInt' 2024-02-19 09:03:51 +08:00
63e77eb3cb 修改驾驶舱能源日期 2024-02-06 16:13:19 +08:00
2ee2b2bfc7 订单管理 2024-02-06 14:11:35 +08:00
lb
441a0f5371 update new table 2024-02-05 16:45:23 +08:00
lb
f67930941f before change table 2024-02-05 16:12:31 +08:00
lb
86996f8dd2 1 2024-02-05 11:23:14 +08:00
lb
9f82aac931 1 2024-02-05 11:17:19 +08:00
lb
ae7b13695a add waitinglist page and its dialogs 2024-02-05 10:59:36 +08:00
lb
372749e313 update 设备维修 2024-02-04 17:00:12 +08:00
lb
d0a4dc527f update 保养记录 2024-02-04 16:30:14 +08:00
lb
71aab2df9a update 保养监控 2024-02-04 15:43:33 +08:00
lb
fd7e295975 update 保养计划配置 2024-02-04 14:33:39 +08:00
lb
da5596766c Update 保养计划配置 2024-02-02 16:56:45 +08:00
0a91161afe merge test 2024-02-02 14:39:11 +08:00
896675a3e9 环保管理数据修饰 2024-02-02 14:29:20 +08:00
lb
3a3e33db0e update special equipment management 2024-02-02 13:20:33 +08:00
lb
49afcb7666 update firefighting 2024-02-02 13:15:25 +08:00
‘937886381’
009cf3b8e6 合并冲突 2024-02-01 16:49:53 +08:00
‘937886381’
5098555a5e 修改bug 2024-02-01 16:48:58 +08:00
lb
4a68467d88 update 安全设备 2024-02-01 16:19:42 +08:00
gtz
1d4a3f1d93 1 2024-02-01 15:02:16 +08:00
2a504a715f merge test 2024-02-01 14:31:57 +08:00
1bbd9b1e3a 班组 2024-02-01 14:24:12 +08:00
gtz
004468ca8e Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-30 18:14:01 +08:00
gtz
65370dbdcb 1 2024-01-30 18:13:57 +08:00
‘937886381’
39aaf82345 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-30 18:11:45 +08:00
‘937886381’
7ad64c7611 安灯权限管理 2024-01-30 18:08:59 +08:00
helloDy
0eae057ddc Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-01-30 14:17:24 +08:00
helloDy
101dc1807e 时间提示 2024-01-30 14:13:35 +08:00
gtz
3fb9ed3c73 '1' 2024-01-29 16:52:56 +08:00
‘937886381’
c7ec6da39c 修改bug 2024-01-29 16:50:05 +08:00
gtz
4af038ffca 1 2024-01-29 16:01:23 +08:00
‘937886381’
204e200102 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-29 15:56:02 +08:00
‘937886381’
1045a5fbb0 修改看板 2024-01-29 15:55:16 +08:00
gtz
f5273a2b27 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-26 09:34:23 +08:00
helloDy
62f1901c72 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-01-26 09:25:32 +08:00
helloDy
59c62fcb9c 24h 2024-01-26 09:24:54 +08:00
gtz
99f9ced0ee Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-26 08:46:22 +08:00
gtz
4c65cab29c '1' 2024-01-26 08:46:18 +08:00
‘937886381’
bd0636b458 修改bug 2024-01-26 08:37:06 +08:00
‘937886381’
77361c3d5f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-25 17:57:06 +08:00
‘937886381’
41e0d34551 修改bug 2024-01-25 17:56:37 +08:00
21dc0412e3 merge test 2024-01-25 17:20:44 +08:00
6c837a7006 能源手动抄表 2024-01-25 17:18:40 +08:00
gtz
c494927b9c Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-25 16:32:46 +08:00
‘937886381’
f84d66dd7f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-25 16:11:03 +08:00
‘937886381’
459d9268a0 修改bug 2024-01-25 16:10:31 +08:00
gtz
99ac9ace51 '1' 2024-01-25 09:14:09 +08:00
ebe926b83e merge test 2024-01-25 09:09:58 +08:00
2eb21ba31f merge test 2024-01-25 09:01:42 +08:00
4918008a47 修改深加工产线产量及良品率 2024-01-25 08:59:21 +08:00
‘937886381’
c1ca2db161 修改bug 2024-01-24 17:17:50 +08:00
‘937886381’
c47dddfcdc 修改bug 2024-01-24 17:16:05 +08:00
gtz
af347f7380 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-24 16:31:26 +08:00
‘937886381’
d5b1d418a8 修改bug 2024-01-23 16:22:25 +08:00
gtz
861bda5df2 ' 2024-01-22 14:06:19 +08:00
gtz
60dd76f165 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-18 14:13:45 +08:00
‘937886381’
7534ab7817 修改bug 2024-01-18 14:10:49 +08:00
820d503d8d merge test 2024-01-18 14:07:48 +08:00
e1015e382f 添加时间 2024-01-18 14:05:39 +08:00
‘937886381’
bee302b08e 修改图例 2024-01-17 15:30:47 +08:00
‘937886381’
d230508e9c Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-17 09:25:44 +08:00
2e5ba8a891 merge test 2024-01-17 09:12:43 +08:00
a637977e12 ui测试修改 2024-01-17 09:11:02 +08:00
‘937886381’
c3b747d019 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-16 16:10:18 +08:00
‘937886381’
7ac9b6d35f 修改bug 2024-01-16 16:09:52 +08:00
3aa7825c56 merge test 2024-01-12 13:29:11 +08:00
cd416d7d01 订单监控加分页&驾驶舱样式调整 2024-01-12 11:23:14 +08:00
gtz
ec3b6100b3 '1' 2024-01-12 10:02:58 +08:00
‘937886381’
d06784c2c3 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-12 10:00:41 +08:00
‘937886381’
44ca0595ec 假数据 2024-01-12 10:00:17 +08:00
90be2a826b 驾驶舱修改 2024-01-12 09:45:36 +08:00
02e506c7d6 1 2024-01-11 14:31:23 +08:00
09adddb69e merge test 2024-01-11 13:59:43 +08:00
6c02990cb5 驾驶舱提测ui 2024-01-11 13:44:38 +08:00
gtz
7d29690457 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-11 09:27:15 +08:00
lb
5d157505aa update 2024-01-11 09:05:31 +08:00
lb
44b45a6a04 merge test 2024-01-11 09:02:56 +08:00
gtz
60211b3a3c '1' 2024-01-10 18:01:22 +08:00
gtz
fad5b160bc '1' 2024-01-10 18:00:01 +08:00
lb
593c9f7d60 bugfix 240110qun 2024-01-10 11:27:04 +08:00
‘937886381’
95b70b2415 修改bug 2024-01-09 16:35:07 +08:00
‘937886381’
040b76d276 解决冲突 2024-01-09 16:26:14 +08:00
‘937886381’
f066180c26 修改bug 2024-01-09 16:25:12 +08:00
gtz
d26852cd2f '1' 2024-01-09 09:56:49 +08:00
b1458827f1 merge test 2024-01-08 17:01:55 +08:00
10ad3acf9c 驾驶舱 2024-01-08 16:59:42 +08:00
helloDy
ce4aabaaf3 merge 2024-01-08 16:24:27 +08:00
helloDy
16551a5f9d 参数 产品 2024-01-08 16:22:53 +08:00
6b8575b29d merge test 2024-01-05 11:17:31 +08:00
d42786e7ed SJG样式 2024-01-05 11:03:08 +08:00
‘937886381’
0a1bc65e79 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-05 08:45:00 +08:00
‘937886381’
95c9e8501a 修改bug 2024-01-05 08:44:31 +08:00
bd1c02b24a merge test 2024-01-04 16:40:43 +08:00
6ea650e7eb 1.4 2024-01-04 16:37:14 +08:00
‘937886381’
8b1dbbeeea 修改 2024-01-04 08:33:05 +08:00
gtz
522910e432 'update_coldboard' 2024-01-04 08:27:12 +08:00
gtz
8c089da31b Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-01-03 14:22:02 +08:00
da2999e67c merge test 2024-01-03 14:12:25 +08:00
53f2b242a4 窑炉 2024-01-03 14:08:49 +08:00
gtz
22f3e06585 'update_coldboard' 2024-01-03 13:11:50 +08:00
lb
e544b91861 merge test 2024-01-03 09:13:06 +08:00
lb
e848be2a35 update 2024-01-03 09:10:29 +08:00
gtz
bdf292654b 'update_coldboard' 2024-01-02 09:20:55 +08:00
gtz
d0a0eadafe 'merge' 2023-12-29 17:59:57 +08:00
gtz
91526eb847 '1' 2023-12-29 17:57:29 +08:00
‘937886381’
0e0171cc0f 修改bug 2023-12-29 16:44:25 +08:00
‘937886381’
1c5e77258e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2023-12-29 16:29:50 +08:00
‘937886381’
ebd7cb02ff 修改bug 2023-12-29 16:29:15 +08:00
gtz
ebb8d3f184 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-29 10:06:09 +08:00
gtz
e2039141e6 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-29 09:41:48 +08:00
gtz
286a9a1a0a '1' 2023-12-29 09:41:45 +08:00
75aa253a29 merge test 2023-12-29 09:35:36 +08:00
35bcb23920 12.29 2023-12-29 09:26:07 +08:00
‘937886381’
b6f801c6ce Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2023-12-29 09:00:46 +08:00
‘937886381’
9e2da2ddc2 修改 2023-12-29 09:00:00 +08:00
9690ab4f70 merge test 2023-12-28 16:18:07 +08:00
41e1f46cfc 1 2023-12-28 16:16:25 +08:00
helloDy
a8ca7c37f2 工单详情 2023-12-28 09:02:31 +08:00
helloDy
f617597f38 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2023-12-22 16:41:28 +08:00
helloDy
df7bc08f71 工单详情ui 2023-12-22 16:35:03 +08:00
lb
5974e7026e update kiln databorad 2023-12-21 10:26:56 +08:00
lb
29e5a3d07a Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-21 09:03:09 +08:00
lb
d647dc0448 update 2023-12-20 17:01:40 +08:00
4c99d39f8a 修改 2023-12-20 14:22:30 +08:00
220ed16c64 merge test 2023-12-20 14:15:25 +08:00
39d2c4a959 菜单 2023-12-20 14:11:05 +08:00
lb
a764e20bd4 update 2023-12-20 10:45:00 +08:00
lb
b9db57d66a Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-20 10:27:59 +08:00
lb
9561dc27e3 fix some bugs 2023-12-20 10:26:38 +08:00
‘937886381’
6d8889bbec Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2023-12-19 16:32:46 +08:00
‘937886381’
553d19db89 修改bug 2023-12-19 16:32:12 +08:00
lb
c91be221dc Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-19 14:10:16 +08:00
lb
069b28eeae update login 2023-12-19 14:09:37 +08:00
1d61f056b8 merge test 2023-12-19 10:15:15 +08:00
lb
5ad93105b3 update login 2023-12-19 09:31: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
lb
aaa131cb1f update 巡检记录 2023-12-18 17:00:47 +08:00
lb
f6af441030 update 巡检配置 2023-12-18 16:32:16 +08:00
lb
cb9132abc1 update 2023-12-18 15:48:18 +08:00
lb
5886875770 update 维修 2023-12-18 15:39:18 +08:00
ccb2808e60 logo 2023-12-18 15:12:17 +08:00
zwq
ef4b31fe2b 成本bug 2023-12-18 14:33:31 +08:00
zwq
20f5a0d4c7 修改成本bug 2023-12-18 14:26:23 +08:00
lb
fd4b0088dc update 特殊设备保养 2023-12-18 14:25:08 +08:00
‘937886381’
c8d55ff625 解决冲突 2023-12-15 16:28:37 +08:00
‘937886381’
83fc835c51 质量管理 2023-12-15 16:27:30 +08:00
lb
165a833088 update 保养记录 2023-12-14 16:58:33 +08:00
gtz
8d5623bb24 '1' 2023-12-14 16:07:21 +08:00