Compare commits

..

757 Commits

Author SHA1 Message Date
0c5245ef9b 订单详情修改字段 2024-03-18 08:27:05 +08:00
1ea2fe2738 Merge pull request 'projects/mesxc-lb' (#250) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #250
2024-03-16 19:19:56 +08:00
lb
549d66f753 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-15 17:04:29 +08:00
lb
ca129f5434 update core-worker的全列表获取地址 2024-03-15 17:03:52 +08:00
b5049b22fa Merge pull request 'projects/mesxc-zhp' (#249) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #249
2024-03-15 13:46:38 +08:00
‘937886381’
a4994ca5ae Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-15 13:44:27 +08:00
‘937886381’
448467ed61 修改bug 2024-03-15 13:43:59 +08:00
5af67b93fb Merge pull request '厂务订单里改个工单接口' (#248) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #248
2024-03-15 13:34:45 +08:00
73928a0ed0 厂务订单里改个工单接口 2024-03-15 13:33:58 +08:00
3d33912eff Merge pull request 'projects/mesxc-dy' (#247) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #247
2024-03-15 08:29:36 +08:00
helloDy
db2cbb64c9 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-14 20:20:18 +08:00
helloDy
67948c10cb bug -- 2024-03-14 20:19:42 +08:00
60864e7110 Merge pull request 'projects/mesxc-lb' (#246) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #246
2024-03-14 18:02:44 +08:00
lb
e3133cef1f Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-14 17:08:39 +08:00
efdf1f5b54 Merge pull request 'projects/mesxc-zhp' (#244) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #244
2024-03-14 14:57:12 +08:00
‘937886381’
eba9d2ba60 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-14 14:54:37 +08:00
‘937886381’
6b96f84150 修改bug 2024-03-14 14:54:03 +08:00
7de46a583f Merge pull request '班组bug' (#243) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #243
2024-03-14 14:48:30 +08:00
526bb8c534 班组bug 2024-03-14 14:47:57 +08:00
lb
7b4cd85ba0 1 2024-03-14 14:36:52 +08:00
57660ee5fd Merge pull request 'projects/mesxc-lb' (#242) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #242
2024-03-14 09:03:49 +08:00
lb
764030a8da Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-14 09:01:45 +08:00
2d7fc02e0b Merge pull request 'projects/mesxc-zhp' (#241) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #241
2024-03-14 08:45:24 +08:00
lb
d2e38be1e1 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-13 18:16:15 +08:00
lb
26d2e2b7e5 ui drawer ui change 2024-03-13 18:14:06 +08:00
lb
25f3c5d13b update 项目群更新 2024-03-13 17:04:36 +08:00
‘937886381’
0256306c0e Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-13 15:30:38 +08:00
‘937886381’
224625e10f 修改bug 2024-03-13 15:30:08 +08:00
e55198974d Merge pull request 'projects/mesxc-zhp' (#240) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #240
2024-03-13 14:57:25 +08:00
‘937886381’
680f852057 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-13 14:55:00 +08:00
‘937886381’
6025c8fbf7 修改bug 2024-03-13 14:54:35 +08:00
a4f5e75d3d Merge pull request 'projects/mesxc-dy' (#239) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #239
2024-03-13 09:17:11 +08:00
helloDy
149ec4c844 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-12 18:02:52 +08:00
helloDy
8045c303ee 维修 2024-03-12 18:02:16 +08:00
lb
3aee4a54fb Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-12 15:50:41 +08:00
bf700b316e Merge pull request 'projects/mesxc-zhp' (#238) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #238
2024-03-12 11:22:06 +08:00
‘937886381’
4c9277b361 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-12 11:18:28 +08:00
‘937886381’
0457514f1e 修改bug 2024-03-12 11:18:06 +08:00
b23d7427bd Merge pull request 'projects/mesxc-zhp' (#237) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #237
2024-03-11 17:10:16 +08:00
‘937886381’
3be7ac4237 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-11 17:07:06 +08:00
‘937886381’
bddb182b73 修改bug 2024-03-11 17:06:38 +08:00
a74b3aa30a Merge pull request 'projects/mesxc-zhp' (#236) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #236
2024-03-11 15:53:13 +08:00
‘937886381’
8f0de8f0ba Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-11 15:48:19 +08:00
‘937886381’
df75aa04a1 修改bug 2024-03-11 15:47:46 +08:00
4531429e83 Merge pull request 'projects/mesxc-zhp' (#235) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #235
2024-03-08 18:48:29 +08:00
‘937886381’
756ed9772d Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-08 16:20:29 +08:00
‘937886381’
2e214b52a6 修改bug 2024-03-08 16:20:03 +08:00
a42f976127 Merge pull request 'projects/mesxc-zhp' (#234) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #234
2024-03-07 16:33:38 +08:00
‘937886381’
a81f961aca Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-07 16:28:50 +08:00
‘937886381’
39493549b9 修改bug 2024-03-07 16:28:23 +08:00
79394affb5 Merge pull request 'projects/mesxc-zhp' (#233) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #233
2024-03-06 11:06:58 +08:00
‘937886381’
2c06d68d72 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-06 11:02:00 +08:00
‘937886381’
e6e280c930 修改bug 2024-03-06 11:01:31 +08:00
354fd488a9 Merge pull request 'projects/mesxc-zhp' (#232) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #232
2024-03-05 10:07:27 +08:00
‘937886381’
a80ce13de1 解决冲突 2024-03-05 09:49:01 +08:00
‘937886381’
a027c4ca63 修改bug 2024-03-05 09:48:16 +08:00
267ee0015c Merge pull request 'projects/mesxc-zjl' (#231) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #231
2024-03-04 14:10:21 +08:00
9a6aa75171 merge test 2024-03-04 14:09:07 +08:00
41b79ba82c Merge pull request 'projects/mesxc-lb' (#230) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #230
2024-03-04 14:07:08 +08:00
Melete
0a1175075d Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-04 14:04:37 +08:00
Melete
50cfcc3af2 update 2024-03-04 14:01:53 +08:00
d44f76b641 集团-包装要求 2024-03-04 13:56:42 +08:00
ac36dea881 Merge pull request 'projects/mesxc-dy' (#229) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #229
2024-03-04 12:24:25 +08:00
helloDy
063532567b Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-04 12:04:50 +08:00
873653b56d Merge pull request 'projects/mesxc-lb' (#227) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #227
2024-03-04 11:19:32 +08:00
helloDy
b2c6a5fae9 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-04 11:15:49 +08:00
helloDy
17b675cd13 checkperson delete 2024-03-04 11:15:09 +08:00
Melete
3aa3361559 merge 2024-03-04 11:01:48 +08:00
Melete
6df8c3bcc1 1 2024-03-04 10:53:04 +08:00
Melete
da0aa4aa75 bugfix 2024-03-04 10:47:57 +08:00
3b6483f013 Merge pull request 'projects/mesxc-dy' (#226) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #226
2024-03-04 07:52:03 +08:00
helloDy
e509722ac4 env 2024-03-01 20:41:09 +08:00
helloDy
48e7612a78 bug second 2024-03-01 20:39:52 +08:00
679f31af97 Merge pull request 'projects/mesxc-zhp' (#225) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #225
2024-03-01 15:30:10 +08:00
‘937886381’
f685a65a1f 解决冲突 2024-03-01 15:28:12 +08:00
‘937886381’
d8c126fccf 修改bug 2024-03-01 15:27:01 +08:00
4f14b32a83 Merge pull request 'projects/mesxc-lb' (#224) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #224
2024-03-01 11:21:10 +08:00
lb
f378347063 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-01 11:20:00 +08:00
6452b6a12c Merge pull request '3,1' (#223) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #223
2024-03-01 11:17:41 +08:00
151df54032 3,1 2024-03-01 11:17:11 +08:00
lb
4c41d6fad9 bugfix 2024-03-01 11:16:53 +08:00
9beca01fef Merge pull request 'projects/mesxc-lb' (#222) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #222
2024-02-29 17:04:19 +08:00
lb
c66e82b152 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-29 17:02:08 +08:00
lb
38668fca09 bugfix 设备保养 2024-02-29 17:01:35 +08:00
20bf8c27f0 Merge pull request 'projects/mesxc-zjl' (#221) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #221
2024-02-29 16:53:00 +08:00
afe28d103e 1 2024-02-29 16:52:30 +08:00
lb
889f4472e6 bugfix equipmentRepair 2024-02-29 16:49:54 +08:00
606a23f10d merge test 2024-02-29 16:47:54 +08:00
5deaa0bc1e 修改bug 2024-02-29 16:46:25 +08:00
933a4e45a6 Merge pull request 'projects/mesxc-dy' (#220) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #220
2024-02-29 16:45:58 +08:00
helloDy
7c8c584837 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-29 15:55:12 +08:00
lb
838c8d66ad 1 2024-02-29 15:54:49 +08:00
helloDy
93eb12aeb7 bugs 2024-02-29 15:54:23 +08:00
lb
a41db38229 update 群里反馈的 2024-02-29 14:13:17 +08:00
a822ffe138 Merge pull request '订单状态对于按钮操作确认修改' (#219) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #219
2024-02-29 09:21:07 +08:00
d750cbe0f8 订单状态对于按钮操作确认修改 2024-02-29 09:20:34 +08:00
1318e96d0d Merge pull request 'projects/mesxc-zjl' (#218) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #218
2024-02-28 17:03:31 +08:00
4174feab9e merge test 2024-02-28 17:03:06 +08:00
e0aa0b7052 Merge pull request 'projects/mesxc-dy' (#217) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #217
2024-02-28 16:57:00 +08:00
ce1971727a 集团订单 2024-02-28 16:56:47 +08:00
helloDy
f8d033c97a Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-28 16:15:16 +08:00
helloDy
ecb447c052 巡检 2024-02-28 16:14:41 +08:00
dd6f07a9b0 Merge pull request 'projects/mesxc-dy' (#216) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #216
2024-02-28 15:09:46 +08:00
helloDy
0ba8d3bff8 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-28 15:04:29 +08:00
helloDy
1a622dc4d3 待确认 2024-02-28 15:03:21 +08:00
2fe3aebe89 Merge pull request 'projects/mesxc-zhp' (#215) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #215
2024-02-28 11:23:36 +08:00
‘937886381’
bf90cc453d Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-02-28 10:55:19 +08:00
‘937886381’
afd6e68d9b 修改bug 2024-02-28 10:54:44 +08:00
helloDy
c71d99a21e Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-28 09:29:10 +08:00
helloDy
dbbccc7d72 bug 2024-02-28 09:28:34 +08:00
ac162415c5 Merge pull request 'projects/mesxc-lb' (#214) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #214
2024-02-28 09:09:13 +08:00
lb
2c87e3f3b8 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-28 09:05:42 +08:00
lb
529596b923 update 保养记录待确认 2024-02-27 17:08:15 +08:00
2a7bfa2562 Merge pull request 'projects/mesxc-dy' (#213) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #213
2024-02-27 16:42:26 +08:00
helloDy
520c31a9e1 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-27 16:40:13 +08:00
helloDy
8e1a1848fb bug 2024-02-27 16:39:39 +08:00
a00edd8938 Merge pull request 'projects/mesxc-lb' (#212) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #212
2024-02-27 16:36:49 +08:00
lb
71d1986671 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-27 16:15:37 +08:00
lb
7287a1f6fa update 2024-02-27 16:13:54 +08:00
‘937886381’
38911a29d2 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-02-27 16:12:49 +08:00
‘937886381’
6490fe3f45 修改 2024-02-27 16:12:21 +08:00
lb
8abe75a9b9 update待确认巡检单 2024-02-27 15:55:52 +08:00
44dc55d69f Merge pull request 'projects/mesxc-dy' (#211) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #211
2024-02-27 09:27:20 +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
5c251e6a25 Merge pull request 'projects/mesxc-zjl' (#210) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #210
2024-02-27 09:14:48 +08:00
a8013fce87 merge test 2024-02-27 09:14:10 +08:00
65e2f9ed6a 订单bug修改 2024-02-27 09:12:17 +08:00
ad3a2cb1ae Merge pull request 'projects/mesxc-lb' (#209) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #209
2024-02-27 09:11:12 +08:00
lb
6d3b41a394 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-26 17:06:19 +08:00
007cf5e638 Merge pull request '订单bug' (#208) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #208
2024-02-26 13:19:19 +08:00
3e89f4066f 订单bug 2024-02-26 13:18:21 +08:00
2c12a26e64 Merge pull request 'projects/mesxc-zjl' (#207) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #207
2024-02-26 10:46:26 +08:00
c5925e54cd merge test 2024-02-26 10:45:48 +08:00
af426f4bf8 Merge pull request 'projects/mesxc-dy' (#206) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #206
2024-02-26 10:44:07 +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
e78a5e1b85 Merge pull request 'projects/mesxc-lb' (#205) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #205
2024-02-26 02:14:06 +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
38bb5a31e7 Merge pull request 'projects/mesxc-zjl' (#204) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #204
2024-02-23 17:13:39 +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
2c88d442f2 Merge pull request 'projects/mesxc-zhp' (#203) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #203
2024-02-23 16:14:40 +08:00
‘937886381’
8dccbdbeb7 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-02-23 16:13:11 +08:00
‘937886381’
81c1f2c571 xiugaibug 2024-02-23 16:12:43 +08:00
5dd551c795 Merge pull request 'projects/mesxc-zhp' (#202) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #202
2024-02-23 16:09:54 +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
478baaabd4 Merge pull request 'projects/mesxc-dy' (#201) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #201
2024-02-22 09:31:30 +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
fd03fdf046 Merge pull request 'projects/mesxc-zhp' (#200) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #200
2024-02-21 16:09:58 +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
d21bec434e Merge pull request '修改成本-仓库parseInt' (#199) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #199
2024-02-19 09:41:32 +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
967fed392d Merge pull request 'projects/mesxc-zjl' (#198) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #198
2024-02-02 14:40:25 +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
6793ac7c50 Merge pull request 'projects/mesxc-zhp' (#197) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #197
2024-02-01 16:52:02 +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
gtz
23f63c30bf 1 2024-02-01 15:01:41 +08:00
26bf5165df Merge pull request 'projects/mesxc-zjl' (#196) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #196
2024-02-01 14:32:49 +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
61b6ceb965 Merge pull request 'projects/mesxc-zhp' (#195) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #195
2024-01-30 18:12:45 +08:00
‘937886381’
39aaf82345 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-30 18:11:45 +08:00
4f810ee26a Merge pull request 'projects/mesxc-dy' (#194) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #194
2024-01-30 18:11:01 +08:00
‘937886381’
4dceaca2e3 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-30 18:09:26 +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
32b7abea82 Merge pull request 'projects/mesxc-zhp' (#193) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #193
2024-01-29 16:51:47 +08:00
‘937886381’
fe836b36ce Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-29 16:50:43 +08:00
‘937886381’
c7ec6da39c 修改bug 2024-01-29 16:50:05 +08:00
gtz
4af038ffca 1 2024-01-29 16:01:23 +08:00
gtz
c6e0e0bd2f 1 2024-01-29 16:00:02 +08:00
ccce85ce21 Merge pull request 'projects/mesxc-zhp' (#192) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #192
2024-01-29 15:59:39 +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
gtz
62ba32ca17 '1' 2024-01-26 09:34:18 +08:00
7a98ee1d0c Merge pull request 'projects/mesxc-dy' (#191) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #191
2024-01-26 09:33:12 +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
029a2fa6d7 Merge pull request 'projects/mesxc-zhp' (#190) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #190
2024-01-26 08:39:22 +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
a7dd966e3f Merge pull request 'projects/mesxc-zjl' (#189) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #189
2024-01-25 17:21:16 +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
720849ba7d Merge pull request 'projects/mesxc-zhp' (#188) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #188
2024-01-25 16:28:11 +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
2c34573e28 Merge pull request 'projects/mesxc-zjl' (#187) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #187
2024-01-25 09:11:16 +08:00
ebe926b83e merge test 2024-01-25 09:09:58 +08:00
16e5142ab5 Merge pull request 'projects/mesxc-zhp' (#186) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #186
2024-01-25 09:05:19 +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’
44bc4a4659 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-24 17:16:27 +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
778ebf6906 Merge pull request 'projects/mesxc-zhp' (#185) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #185
2024-01-23 16:33:24 +08:00
‘937886381’
3bc12b8830 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-23 16:22:53 +08:00
‘937886381’
d5b1d418a8 修改bug 2024-01-23 16:22:25 +08:00
gtz
861bda5df2 ' 2024-01-22 14:06:19 +08:00
gtz
dd2f982677 '1' 2024-01-18 14:13:55 +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
ac3957e0c7 Merge pull request 'projects/mesxc-zhp' (#184) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #184
2024-01-18 14:13:06 +08:00
‘937886381’
05ce0dbd84 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-01-18 14:11:10 +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
670ded0511 Merge pull request 'projects/mesxc-zhp' (#183) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #183
2024-01-17 15:36:18 +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
c95635565a Merge pull request 'projects/mesxc-zjl' (#182) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #182
2024-01-17 09:13:42 +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
286204165a Merge pull request 'projects/mesxc-zjl' (#181) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #181
2024-01-12 13:30:29 +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
3248070168 Merge pull request 'projects/mesxc-zhp' (#180) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #180
2024-01-12 10:01:50 +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
3647e9ba00 Merge pull request 'projects/mesxc-zjl' (#179) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #179
2024-01-12 09:48:36 +08:00
1438a1ff8b merge test 2024-01-12 09:47:47 +08:00
90be2a826b 驾驶舱修改 2024-01-12 09:45:36 +08:00
c94e3cec0b Merge pull request '1' (#178) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #178
2024-01-11 14:31:57 +08:00
02e506c7d6 1 2024-01-11 14:31:23 +08:00
822ea71411 Merge pull request 'projects/mesxc-zjl' (#177) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #177
2024-01-11 14:01:14 +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
1026a849f1 Merge pull request 'projects/mesxc-lb' (#176) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #176
2024-01-11 09:26:14 +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
b38a79eca1 Merge pull request 'projects/mesxc-zhp' (#175) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #175
2024-01-09 16:40:31 +08:00
‘937886381’
95b70b2415 修改bug 2024-01-09 16:35:07 +08:00
‘937886381’
30b2d19710 解决冲突 2024-01-09 16:28:50 +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
a2ea1ca926 Merge pull request 'projects/mesxc-zjl' (#174) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #174
2024-01-08 17:02:44 +08:00
b1458827f1 merge test 2024-01-08 17:01:55 +08:00
10ad3acf9c 驾驶舱 2024-01-08 16:59:42 +08:00
2e8852f667 Merge pull request 'projects/mesxc-dy' (#173) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #173
2024-01-08 16:28:06 +08:00
helloDy
ce4aabaaf3 merge 2024-01-08 16:24:27 +08:00
helloDy
16551a5f9d 参数 产品 2024-01-08 16:22:53 +08:00
b7ab59d5cd Merge pull request '1' (#172) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #172
2024-01-05 11:20:07 +08:00
d619db3d89 1 2024-01-05 11:19:39 +08:00
5444c7a90e Merge pull request 'projects/mesxc-zjl' (#171) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #171
2024-01-05 11:18:27 +08:00
6b8575b29d merge test 2024-01-05 11:17:31 +08:00
d42786e7ed SJG样式 2024-01-05 11:03:08 +08:00
8df2bbae1a Merge pull request 'projects/mesxc-zhp' (#170) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #170
2024-01-05 08:46:40 +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
d21749c170 Merge pull request 'projects/mesxc-zjl' (#168) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #168
2024-01-04 16:41:50 +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
c1142be780 Merge pull request 'projects/mesxc-zjl' (#167) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #167
2024-01-03 14:13:11 +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
9fc429bc64 Merge pull request 'projects/mesxc-lb' (#166) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #166
2024-01-03 10:21:52 +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
3d198d83cb '1' 2023-12-30 09:23:37 +08:00
gtz
d0a0eadafe 'merge' 2023-12-29 17:59:57 +08:00
gtz
91526eb847 '1' 2023-12-29 17:57:29 +08:00
7667903218 Merge pull request 'projects/mesxc-zhp' (#165) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #165
2023-12-29 17:10:11 +08:00
‘937886381’
05c0166003 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2023-12-29 16:45:35 +08:00
‘937886381’
0e0171cc0f 修改bug 2023-12-29 16:44:25 +08:00
9d34ca02f1 Merge pull request 'projects/mesxc-zhp' (#164) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #164
2023-12-29 16:32:28 +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
0789decfd9 Merge pull request 'projects/mesxc-zjl' (#163) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #163
2023-12-29 10:05:42 +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
14967cbf67 Merge pull request 'projects/mesxc-zhp' (#162) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #162
2023-12-29 09:32:21 +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
e72da57a54 Merge pull request 'projects/mesxc-zjl' (#160) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #160
2023-12-28 16:19:32 +08:00
9690ab4f70 merge test 2023-12-28 16:18:07 +08:00
41e1f46cfc 1 2023-12-28 16:16:25 +08:00
a6127657cc Merge pull request 'projects/mesxc-dy' (#159) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #159
2023-12-28 09:04:52 +08:00
helloDy
60a6e86a6b Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2023-12-28 09:03:10 +08:00
helloDy
a8ca7c37f2 工单详情 2023-12-28 09:02:31 +08:00
0bb434bc22 Merge pull request 'projects/mesxc-dy' (#158) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #158
2023-12-22 17:17:58 +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
d65f5f9bca Merge pull request 'projects/mesxc-zjl' (#157) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #157
2023-12-20 14:23:37 +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
b0bac562c3 Merge pull request 'projects/mesxc-lb' (#156) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #156
2023-12-20 10:45:58 +08:00
lb
60a94cd839 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-20 10:45:19 +08:00
lb
a764e20bd4 update 2023-12-20 10:45:00 +08:00
e1384a2d3e Merge pull request 'projects/mesxc-lb' (#155) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #155
2023-12-20 10:28:42 +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
cb6e3c3d5f Merge pull request 'projects/mesxc-zhp' (#154) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #154
2023-12-19 16:36:44 +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
f0536c9cf9 Merge pull request 'projects/mesxc-lb' (#153) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #153
2023-12-19 14:10:49 +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
84cc6dfde7 Merge pull request 'projects/mesxc-zjl' (#152) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #152
2023-12-19 10:15:53 +08:00
1d61f056b8 merge test 2023-12-19 10:15:15 +08:00
eda63ee8c8 Merge pull request 'projects/mesxc-lb' (#151) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #151
2023-12-19 09:55:21 +08:00
lb
78e8401029 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-19 09:54:47 +08:00
lb
5ad93105b3 update login 2023-12-19 09:31:38 +08:00
97612a13ac Merge pull request 'projects/mesxc-lb' (#150) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #150
2023-12-19 09:09:59 +08:00
lb
d06756c6ff Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-19 09:07:55 +08:00
lb
5ac17b15e1 update merge 2023-12-19 09:07:19 +08:00
4e064e4b01 Merge pull request 'projects/mesxc-lb' (#149) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #149
2023-12-19 09:02:24 +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
a766318e20 Merge pull request '成本bug' (#148) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #148
2023-12-18 14:34:04 +08:00
41cef952ac Merge branch 'projects/mesxc-test' into projects/mesxc-zwq 2023-12-18 14:33:59 +08:00
zwq
ef4b31fe2b 成本bug 2023-12-18 14:33:31 +08:00
c8219bd7ee Merge pull request '修改成本bug' (#147) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #147
2023-12-18 14:26:46 +08:00
zwq
20f5a0d4c7 修改成本bug 2023-12-18 14:26:23 +08:00
lb
fd4b0088dc update 特殊设备保养 2023-12-18 14:25:08 +08:00
e039a3992d Merge pull request 'projects/mesxc-zhp' (#146) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #146
2023-12-15 16:29:57 +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
4fa49c46ff Merge pull request 'projects/mesxc-zjl' (#145) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #145
2023-12-14 15:55:28 +08:00
ae251fc428 merge test 2023-12-14 15:54:46 +08:00
a2c61b86ca Merge pull request 'projects/mesxc-dy' (#144) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #144
2023-12-14 15:52:47 +08:00
503e3442a0 merge test 2023-12-14 15:51:26 +08:00
69a65b32ea 12.14测试bug 2023-12-14 15:48:35 +08:00
lb
5ac0782b36 update 设备保养监控 2023-12-14 15:33:38 +08:00
helloDy
3aec5ee86c merge 2023-12-14 14:03:53 +08:00
helloDy
79274aa8c8 定制化报表,基础核心 2023-12-14 14:01:19 +08:00
29ea06e5be Merge pull request 'projects/mesxc-zhp' (#143) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #143
2023-12-13 17:08:40 +08:00
‘937886381’
f5bb5f27b4 修改 2023-12-13 16:55:39 +08:00
‘937886381’
fbe8e5c023 新增报表 2023-12-13 16:50:55 +08:00
lb
46dd33cb05 update 特种设备保养 2023-12-13 10:57:02 +08:00
gtz
68898ea67f '1' 2023-12-13 09:49:02 +08:00
gtz
1299d72404 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-13 09:48:44 +08:00
0f4bddc6d1 Merge pull request '更新成本和仓库' (#141) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #141
2023-12-13 09:19:00 +08:00
zwq
91d269e1ce 更新成本和仓库 2023-12-13 09:18:36 +08:00
4e26d49ff5 Merge pull request '首页' (#140) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #140
2023-12-13 09:16:28 +08:00
63b19d84e4 首页 2023-12-13 09:12:52 +08:00
lb
5f47cb131f add 添加消防设备 2023-12-12 16:50:18 +08:00
lb
ea21f3d4bc add 安全设备,特种设备 2023-12-12 16:27:37 +08:00
lb
bdda6c9985 add 特殊设备 2023-12-12 13:57:02 +08:00
lb
ae83da6eb9 almost done 2023-12-12 11:29:56 +08:00
6c7390f61e Merge pull request 'projects/mesxc-zjl' (#139) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #139
2023-12-12 10:57:12 +08:00
1661615af4 环保 2023-12-12 10:56:25 +08:00
lb
b62d0e4096 add israchart 2023-12-12 10:53:00 +08:00
lb
1c123fa22d Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-11 10:22:51 +08:00
lb
6b3619514d update 驾驶舱 2023-12-11 10:21:45 +08:00
lb
dee9f7ce8b update 2023-12-11 09:47:58 +08:00
lb
b4d2b69004 update 2023-12-11 09:11:51 +08:00
8fdaa3e968 环保管理 2023-12-08 17:03:01 +08:00
gtz
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
gtz
f99e979d14 '1' 2023-12-07 10:06:14 +08:00
lb
4f64c255af update 2023-12-06 15:29:11 +08:00
lb
cc0d3d8b75 add 烟气处理 2023-12-06 10:38:56 +08:00
lb
f5233001e7 add Energy&Header 2023-12-06 10:18:12 +08:00
f2e38b5e67 Merge pull request 'projects/mesxc-zjl' (#138) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #138
2023-12-06 10:09:07 +08:00
fe0c84bc3a 能源&bug 2023-12-06 10:06:26 +08:00
lb
7cb88fab88 add 用量统计&风机频率 2023-12-06 09:49:38 +08:00
lb
e7263302a7 update line 2023-12-05 17:00:55 +08:00
lb
b26e1d5a7f update switcher 2023-12-05 15:44:22 +08:00
lb
86bdabf358 update 2023-12-05 15:24:20 +08:00
lb
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
lb
6c661bedd3 add databoard 2023-12-04 17:00:40 +08:00
‘937886381’
4e48eae2a7 修改ui 2023-12-04 14:14:34 +08:00
lb
a2ed9ed54b fix 添加参数 2023-12-04 09:10:56 +08:00
49d002142f Merge pull request 'projects/mesxc-dy' (#137) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #137
2023-12-01 15:34:28 +08:00
helloDy
8399081a6f Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2023-12-01 15:27:02 +08:00
helloDy
cc6c4772d3 ui 2023-12-01 15:25:46 +08:00
ba7dad7fce Merge pull request 'projects/mesxc-dy' (#136) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #136
2023-11-30 16:01:21 +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
86f246eb94 Merge pull request 'projects/mes-lb' (#134) from projects/mes-lb into projects/mes-test
Reviewed-on: #134
2023-11-30 14:24:09 +08:00
lb
e2a16332be Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-30 14:22:56 +08:00
lb
69b6942f35 fix bugs 2023-11-30 14:19:13 +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
eb063779b4 Merge pull request 'projects/mes-dy' (#129) from projects/mes-dy into projects/mes-test
Reviewed-on: #129
2023-11-30 08:58:32 +08:00
helloDy
a2672c1742 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-30 08:57:43 +08:00
4e97989ede Merge pull request 'projects/mes-zhp' (#131) from projects/mes-zhp into projects/mes-test
Reviewed-on: #131
2023-11-30 08:54:28 +08:00
‘937886381’
67200710c9 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-30 08:52:23 +08:00
7e2b75aaa5 Merge pull request 'projects/mes-zjl' (#130) from projects/mes-zjl into projects/mes-test
Reviewed-on: #130
2023-11-29 17:00:45 +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
5dce57e4bb Merge pull request 'projects/mes-lb' (#127) from projects/mes-lb into projects/mes-test
Reviewed-on: #127
2023-11-29 13:41:28 +08:00
lb
50a75dcb74 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-29 13:37:51 +08:00
lb
9ed4c944c5 fix bugs 2023-11-29 13:36:53 +08:00
lb
6702521f31 overwrite 产线平衡分析 2023-11-29 11:34:43 +08:00
gtz
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
gtz
b0f10b9002 '1' 2023-11-29 10:16:58 +08:00
f37bba6747 Merge pull request 'projects/mes-zjl' (#126) from projects/mes-zjl into projects/mes-test
Reviewed-on: #126
2023-11-29 10:15:59 +08:00
365aafc21a merge test 2023-11-29 10:15:08 +08:00
de65afef11 登录页去掉验证 2023-11-29 10:12:41 +08:00
a135877df1 Merge pull request 'projects/mes-zhp' (#125) from projects/mes-zhp into projects/mes-test
Reviewed-on: #125
2023-11-29 09:06:51 +08:00
‘937886381’
8d26a9e487 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-29 08:49:05 +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
lb
c0daa74a84 update 产线平衡分析 2023-11-28 19:31:08 +08:00
6e7339bca3 Merge pull request 'projects/mes-dy' (#124) from projects/mes-dy into projects/mes-test
Reviewed-on: #124
2023-11-28 19:09:11 +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
13b522475e Merge pull request 'projects/mes-zjl' (#123) from projects/mes-zjl into projects/mes-test
Reviewed-on: #123
2023-11-28 16:51:59 +08:00
1a7e8cfc19 merge test 2023-11-28 16:50:51 +08:00
a0790a6e19 11.28 2023-11-28 16:42:40 +08:00
b76b8f4fe9 Merge pull request 'projects/mes-lb' (#122) from projects/mes-lb into projects/mes-test
Reviewed-on: #122
2023-11-28 16:29:12 +08:00
lb
978291e68a Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-28 16:23:20 +08:00
lb
a5c17d2276 fix conflicts 2023-11-28 16:14:24 +08:00
a7b4e72bc2 Merge pull request 'projects/mes-lb' (#121) from projects/mes-lb into projects/mes-test
Reviewed-on: #121
2023-11-28 15:53:19 +08:00
lb
99f771a445 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-28 15:50:00 +08:00
lb
7201c26792 fix bugs 2023-11-28 15:46:50 +08:00
ad56aaf359 Merge pull request 'projects/mes-zhp' (#120) from projects/mes-zhp into projects/mes-test
Reviewed-on: #120
2023-11-28 11:01:53 +08:00
‘937886381’
5033bbb206 解决冲突 2023-11-28 10:59:24 +08:00
‘937886381’
6fc4794300 修改bug 2023-11-28 10:56:48 +08:00
‘937886381’
79c9f1ca66 修改bug 2023-11-28 10:54:51 +08:00
c74269b282 Merge pull request 'projects/mes-lb' (#119) from projects/mes-lb into projects/mes-test
Reviewed-on: #119
2023-11-28 09:06:58 +08:00
lb
57deff3875 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-28 09:06:01 +08:00
lb
68d3b46bab update process flow 2023-11-28 09:04:57 +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
4323982b89 Merge pull request 'projects/mes-dy' (#118) from projects/mes-dy into projects/mes-test
Reviewed-on: #118
2023-11-28 09:01:37 +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
375273419d Merge pull request 'projects/mes-lb' (#117) from projects/mes-lb into projects/mes-test
Reviewed-on: #117
2023-11-27 17:05:07 +08:00
lb
a18929a261 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-27 17:04:32 +08:00
6d465c17c2 Merge pull request 'projects/mes-zjl' (#116) from projects/mes-zjl into projects/mes-test
Reviewed-on: #116
2023-11-27 16:43:48 +08:00
669345c983 merge test 2023-11-27 16:43:15 +08:00
b86094c630 订单监控 2023-11-27 16:41:14 +08:00
lb
2fdee9cafd update 2023-11-27 15:39:30 +08:00
lb
4348d66e53 update 2023-11-27 14:40:11 +08:00
lb
76c2f50bf3 fix bugs 2023-11-27 11:31:21 +08:00
888b5aa91f Merge pull request 'projects/mes-dy' (#115) from projects/mes-dy into projects/mes-test
Reviewed-on: #115
2023-11-27 09:42:54 +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
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
51f72ea5d2 Merge pull request 'projects/mes-lb' (#114) from projects/mes-lb into projects/mes-test
Reviewed-on: #114
2023-11-27 08:43:14 +08:00
lb
d5507ec4c0 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-24 19:15:23 +08:00
lb
8802c932e2 update 设备报警日志 2023-11-24 19:10:33 +08:00
ee26741e62 Merge pull request 'projects/mes-dy' (#113) from projects/mes-dy into projects/mes-test
Reviewed-on: #113
2023-11-24 19:06:04 +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
328b3ff560 Merge pull request 'projects/mes-zjl' (#112) from projects/mes-zjl into projects/mes-test
Reviewed-on: #112
2023-11-24 17:32:15 +08:00
b3a117f6c6 merge test 2023-11-24 17:31:21 +08:00
8929e53724 ui样式 2023-11-24 17:29:40 +08:00
lb
a8fa98cb91 update StatusAndParams 2023-11-24 14:56:17 +08:00
db081c1bd1 Merge pull request '更新仓库' (#111) from projects/mes-zwq into projects/mes-test
Reviewed-on: #111
2023-11-24 14:37:15 +08:00
zwq
3e9540bcc9 更新仓库 2023-11-24 14:36:59 +08:00
69ceadab69 Merge pull request '更新仓库bug' (#110) from projects/mes-zwq into projects/mes-test
Reviewed-on: #110
2023-11-24 14:33:20 +08:00
zwq
601387184e 更新仓库bug 2023-11-24 14:32:58 +08:00
lb
54b63a7f53 update drawer and edit 2023-11-24 10:41:11 +08:00
b625ef0118 Merge pull request 'projects/mes-dy' (#109) from projects/mes-dy into projects/mes-test
Reviewed-on: #109
2023-11-24 09:19:27 +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
39d06cd902 Merge pull request 'projects/mes-lb' (#108) from projects/mes-lb into projects/mes-test
Reviewed-on: #108
2023-11-24 08:56:13 +08:00
lb
d79ba71bd7 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-24 08:51:18 +08:00
lb
0225be1c94 fix bugs 2023-11-23 17:07:57 +08:00
265024d989 Merge pull request 'projects/mes-zjl' (#107) from projects/mes-zjl into projects/mes-test
Reviewed-on: #107
2023-11-23 16:58:12 +08:00
960751a264 merge test 2023-11-23 16:57:39 +08:00
978aa3a1d1 ui修改 2023-11-23 16:56:08 +08:00
2eb1afe9b2 Merge pull request '修改仓库UI测试bug' (#106) from projects/mes-zwq into projects/mes-test
Reviewed-on: #106
2023-11-23 16:42:37 +08:00
zwq
8cd53915c1 修改仓库UI测试bug 2023-11-23 16:42:09 +08:00
571d204d68 Merge pull request 'projects/mes-zhp' (#105) from projects/mes-zhp into projects/mes-test
Reviewed-on: #105
2023-11-23 16:41:12 +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
0ce6bc07a0 Merge pull request 'projects/mes-lb' (#104) from projects/mes-lb into projects/mes-test
Reviewed-on: #104
2023-11-22 17:09:03 +08:00
lb
e318aa4f59 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-22 17:05:53 +08:00
lb
ab09a2b08c update zentao bugs 2023-11-22 17:04:22 +08:00
d2d5503792 Merge pull request 'projects/mes-zjl' (#103) from projects/mes-zjl into projects/mes-test
Reviewed-on: #103
2023-11-22 17:01:21 +08:00
6940155e4f merge test 2023-11-22 17:00:32 +08:00
dfc758bfae 订单监控图 2023-11-22 16:58:32 +08:00
gtz
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
ec2994e928 Merge pull request 'projects/mes-dy' (#102) from projects/mes-dy into projects/mes-test
Reviewed-on: #102
2023-11-22 14:53:35 +08:00
gtz
c736992a34 '1' 2023-11-22 14:49:56 +08:00
helloDy
5492666b53 merge 2023-11-22 14:43:07 +08:00
lb
cd55b4c860 update 2023-11-22 14:41:53 +08:00
helloDy
a7f811aa3e bug 2023-11-22 14:41:10 +08:00
lb
33188481bf update login 2023-11-22 14:27:30 +08:00
gtz
dcbb2c719b Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-22 14:15:39 +08:00
0200fc08f1 Merge pull request 'projects/mes-zhp' (#101) from projects/mes-zhp into projects/mes-test
Reviewed-on: #101
2023-11-22 14:14:03 +08:00
‘937886381’
a22da566c3 解决冲突 2023-11-22 14:11:23 +08:00
‘937886381’
3c99ddc4c0 修改bug 2023-11-22 14:00:02 +08:00
96705bd4d9 Merge pull request 'update hints' (#100) from projects/mes-lb into projects/mes-test
Reviewed-on: #100
2023-11-22 13:28:39 +08:00
lb
ac28476024 update hints 2023-11-22 11:15:39 +08:00
1299a56e22 Merge pull request 'update some equipment bugs' (#99) from projects/mes-lb into projects/mes-test
Reviewed-on: #99
2023-11-22 10:21:55 +08:00
lb
b348a31b24 update some equipment bugs 2023-11-22 10:14:40 +08:00
gtz
bc2940ca99 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-21 17:30:38 +08:00
67d639c413 Merge pull request 'update bugs' (#98) from projects/mes-lb into projects/mes-test
Reviewed-on: #98
2023-11-21 17:03:52 +08:00
lb
c6d618b2b8 update bugs 2023-11-21 17:02:22 +08:00
aa79d15f52 Merge pull request 'projects/mes-lb' (#97) from projects/mes-lb into projects/mes-test
Reviewed-on: #97
2023-11-21 16:09:15 +08:00
lb
c8fb8d7589 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-21 16:08:44 +08:00
lb
51baca61cc update equipment attach process 2023-11-21 15:07:33 +08:00
lb
847e34fcc6 update 2023-11-21 11:48:17 +08:00
lb
32a43fbc3b update process equipment relation 2023-11-21 09:13:28 +08:00
lb
20975948ef update 2023-11-20 16:50:38 +08:00
c46c4dbf65 Merge pull request '更新仓库bug' (#96) from projects/mes-zwq into projects/mes-test
Reviewed-on: #96
2023-11-20 16:11:49 +08:00
zwq
685a3308db 更新仓库bug 2023-11-20 16:09:42 +08:00
gtz
76938951ed Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-20 16:07:12 +08:00
lb
ac041c2f4a update bom-selector v1 2023-11-20 15:53:23 +08:00
lb
dd23c49ba0 update 设备选择 2023-11-20 14:21:14 +08:00
lb
44452f2e89 update 2023-11-20 11:26:27 +08:00
lb
8ddef0de9d update bomselector 2023-11-17 17:07:52 +08:00
lb
7249abf5b1 add BomSelector 2023-11-17 16:57:55 +08:00
lb
76f5385140 add Candidate 2023-11-17 16:05:57 +08:00
27f4e034be Merge pull request '更新-仓库-2级bug' (#95) from projects/mes-zwq into projects/mes-test
Reviewed-on: #95
2023-11-17 15:48:45 +08:00
zwq
75f59c3279 更新-仓库-2级bug 2023-11-17 15:48:17 +08:00
lb
bb731dfcd4 add custom tree 2023-11-17 14:56:43 +08:00
8c37647aab Merge pull request 'projects/mes-zjl' (#94) from projects/mes-zjl into projects/mes-test
Reviewed-on: #94
2023-11-17 14:08:54 +08:00
bad7175f87 merge test 2023-11-17 14:07:51 +08:00
231e9227a5 1 2023-11-17 14:04:53 +08:00
lb
d3eb9d8fbc update custom-transfer 2023-11-17 11:25:28 +08:00
lb
9a7521e691 add CustomTrasfer 2023-11-17 11:15:18 +08:00
gtz
8b91e7812f '1' 2023-11-17 10:38:44 +08:00
gtz
9cffa01414 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-17 10:38:35 +08:00
e82ee4e542 Merge pull request 'projects/mes-dy' (#93) from projects/mes-dy into projects/mes-test
Reviewed-on: #93
2023-11-17 10:38:28 +08:00
gtz
905479d5f4 'del_dist' 2023-11-17 10:29:23 +08:00
gtz
c1ae248234 '1' 2023-11-17 10:28:39 +08:00
helloDy
40e7d6b6d8 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-17 10:26:21 +08:00
helloDy
1d9b97f1d0 设备信息bug 2023-11-17 10:24:53 +08:00
cfaa17ee28 Merge pull request 'projects/mes-lb' (#92) from projects/mes-lb into projects/mes-test
Reviewed-on: #92
2023-11-17 10:15:36 +08:00
lb
d1cbac481d Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-17 10:14:26 +08:00
lb
c895975703 update 2023-11-17 10:12:00 +08:00
lb
6ef90a8eba merge test 2023-11-17 10:00:04 +08:00
e63b98161f Merge pull request '更新仓库bug' (#91) from projects/mes-zwq into projects/mes-test
Reviewed-on: #91
2023-11-17 09:55:35 +08:00
zwq
c99393dd12 更新仓库bug 2023-11-17 09:55:09 +08:00
lb
23c1b4b3c6 update 2023-11-17 09:48:39 +08:00
gtz
88615a52a4 '1' 2023-11-17 08:46:35 +08:00
gtz
bc3959412d Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-17 05:16:16 +08:00
Melete
010e51c0f6 update 工艺流程 2023-11-16 22:18:45 +08:00
Melete
a6b48280aa update 工艺流程 2023-11-16 22:00:50 +08:00
9f11fa3e00 Merge pull request 'projects/mes-dy' (#90) from projects/mes-dy into projects/mes-test
Reviewed-on: #90
2023-11-16 21:10:11 +08:00
helloDy
c4091b7181 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-16 21:07:59 +08:00
helloDy
34e6a73852 bug 2023-11-16 21:07:21 +08:00
79a6a4804a Merge pull request 'projects/mes-zhp' (#89) from projects/mes-zhp into projects/mes-test
Reviewed-on: #89
2023-11-16 18:56:08 +08:00
‘937886381’
7523f98f84 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-16 18:54:43 +08:00
‘937886381’
b349432eaa 修改bug 2023-11-16 18:52:55 +08:00
4393c0e0e8 Merge pull request 'projects/mes-lb' (#88) from projects/mes-lb into projects/mes-test
Reviewed-on: #88
2023-11-16 17:31:03 +08:00
lb
42177846e8 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-16 17:25:39 +08:00
lb
c5b5de7a78 update 2023-11-16 17:23:58 +08:00
lb
0884159dd7 update login 2023-11-16 17:16:37 +08:00
gtz
87eccc7b25 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-16 17:05:19 +08:00
8a819b84b6 Merge pull request 'projects/mes-zjl' (#87) from projects/mes-zjl into projects/mes-test
Reviewed-on: #87
2023-11-16 16:54:45 +08:00
d37c5881a5 2 2023-11-16 16:53:35 +08:00
2b0579dc70 merge test 2023-11-16 16:13:36 +08:00
6a10afd04e 1 2023-11-16 16:12:05 +08:00
gtz
7c1c61f8f8 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-16 15:27:15 +08:00
fb967fb825 Merge pull request 'projects/mes-dy' (#86) from projects/mes-dy into projects/mes-test
Reviewed-on: #86
2023-11-16 14:09:07 +08:00
helloDy
25d1ac8d90 merge 2023-11-16 14:07:50 +08:00
helloDy
3667b98da9 bug 2023-11-16 13:57:21 +08:00
d3c289f11e Merge pull request 'projects/mes-lb' (#85) from projects/mes-lb into projects/mes-test
Reviewed-on: #85
2023-11-16 13:55:22 +08:00
lb
bbdf0a75f0 update system 2023-11-16 13:47:18 +08:00
gtz
5339854df4 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-16 12:56:11 +08:00
lb
26658accfc Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-16 10:57:20 +08:00
31033dd7e2 Merge pull request 'projects/mes-zhp' (#84) from projects/mes-zhp into projects/mes-test
Reviewed-on: #84
2023-11-16 10:20:53 +08:00
‘937886381’
3832aee028 解决冲突 2023-11-16 08:52:38 +08:00
‘937886381’
2fbc6ea5e7 修改bug 2023-11-16 08:50:59 +08:00
d0cb4d383e Merge pull request 'projects/mes-dy' (#83) from projects/mes-dy into projects/mes-test
Reviewed-on: #83
2023-11-15 18:15:03 +08:00
helloDy
4ce62c14ee Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-15 17:47:31 +08:00
helloDy
e5966c27a3 工单[ 2023-11-15 17:46:54 +08:00
gtz
ea1d981a5a Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-15 16:49:05 +08:00
3e9f629888 Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test
Reviewed-on: #82
2023-11-15 16:03:01 +08:00
‘937886381’
ecabeeeea9 修改bug 2023-11-15 15:47:45 +08:00
gtz
0f7a8fbf73 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-15 15:05:37 +08:00
gtz
d7366e80ee '1' 2023-11-15 15:05:33 +08:00
3da077bdf3 Merge pull request 'projects/mes-dy' (#81) from projects/mes-dy into projects/mes-test
Reviewed-on: #81
2023-11-15 14:55:44 +08:00
helloDy
aef062b4c9 merge 2023-11-15 14:37:52 +08:00
helloDy
952490f0d4 24h,设备 2023-11-15 14:30:28 +08:00
51d6ce5dbb Merge pull request '订单' (#80) from projects/mes-zjl into projects/mes-test
Reviewed-on: #80
2023-11-15 14:23:23 +08:00
0ae68aacef 订单 2023-11-15 14:22:45 +08:00
2ab686a797 Merge pull request 'bug' (#79) from projects/mes-zjl into projects/mes-test
Reviewed-on: #79
2023-11-15 14:03:01 +08:00
a37fa65e8f bug 2023-11-15 14:02:16 +08:00
887390cf91 Merge pull request 'projects/mes-zjl' (#78) from projects/mes-zjl into projects/mes-test
Reviewed-on: #78
2023-11-15 10:18:22 +08:00
5d054254f7 merge test 2023-11-15 10:17:35 +08:00
76cdc34af1 小bug 2023-11-15 10:13:54 +08:00
0fefe4d432 Merge pull request 'projects/mes-zhp' (#77) from projects/mes-zhp into projects/mes-test
Reviewed-on: #77
2023-11-15 10:02:14 +08:00
‘937886381’
ecc84a1c4b 合并冲突 2023-11-15 09:10:45 +08:00
‘937886381’
95f7004d1c 修改bug 2023-11-15 09:08:20 +08:00
9a1aa047b0 Merge pull request '仓库-bug修改' (#76) from projects/mes-zwq into projects/mes-test
Reviewed-on: #76
2023-11-14 16:02:50 +08:00
zwq
de06dfddf4 仓库-bug修改 2023-11-14 16:02:16 +08:00
26100af90a Merge pull request 'projects/mes-zjl' (#75) from projects/mes-zjl into projects/mes-test
Reviewed-on: #75
2023-11-14 15:49:56 +08:00
67612c79df merge test 2023-11-14 15:47:06 +08:00
26862423c1 首页 2023-11-14 10:35:10 +08:00
a1a7256af5 Merge pull request '更新-仓库-库位监控' (#74) from projects/mes-zwq into projects/mes-test
Reviewed-on: #74
2023-11-14 09:43:59 +08:00
zwq
d2c82fa692 更新-仓库-库位监控 2023-11-14 09:42:38 +08:00
5654b3aeef Merge pull request 'update' (#73) from projects/mes-lb into projects/mes-test
Reviewed-on: #73
2023-11-14 09:24:38 +08:00
lb
ebae332674 update 2023-11-14 09:23:08 +08:00
afae859d8b 更新login Merge pull request 'projects/mes-lb' (#71) from projects/mes-lb into projects/mes-test
Reviewed-on: #71
2023-11-13 16:57:14 +08:00
lb
7f6fa0af96 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-13 16:56:07 +08:00
lb
ba92da2d5d update login mobile 2023-11-13 16:55:16 +08:00
lb
06c124a149 update login 2023-11-13 16:37:04 +08:00
e369fe25ca Merge pull request 'projects/mes-dy' (#70) from projects/mes-dy into projects/mes-test
Reviewed-on: #70
2023-11-11 21:40:47 +08:00
helloDy
e6158cd59b merge 2023-11-11 20:51:01 +08:00
helloDy
624ed7bc27 设备管理 2023-11-11 20:49:31 +08:00
afba54fcab Merge pull request 'projects/mes-zhp' (#69) from projects/mes-zhp into projects/mes-test
Reviewed-on: #69
2023-11-10 17:10:49 +08:00
‘937886381’
f7846f2767 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-10 17:03:25 +08:00
‘937886381’
a8adb317c0 质量管理 2023-11-10 17:02:52 +08:00
b185d3ebf7 Merge pull request 'projects/mes-zjl' (#68) from projects/mes-zjl into projects/mes-test
Reviewed-on: #68
2023-11-09 15:07:01 +08:00
045843bc1c mrege test 2023-11-09 15:05:54 +08:00
3812eb38a9 修改订单bug 2023-11-09 15:01:50 +08:00
‘937886381’
1962ecc6df 质量管理 2023-11-07 19:10:45 +08:00
e64e33a203 Merge pull request 'projects/mes-zjl' (#67) from projects/mes-zjl into projects/mes-test
Reviewed-on: #67
2023-11-07 16:01:50 +08:00
3ada2c5d08 merge test 2023-11-07 16:01:07 +08:00
0eb6a99fa9 Merge pull request 'projects/mes-dy' (#66) from projects/mes-dy into projects/mes-test
Reviewed-on: #66
2023-11-07 15:55:56 +08:00
9e8276d3a7 merge test 2023-11-07 15:55:19 +08:00
helloDy
f9741b07c0 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-07 15:53:53 +08:00
helloDy
fcb1885bf7 基础,物料,设备 2023-11-07 15:53:01 +08:00
123d45afa9 Merge pull request '更新仓库' (#65) from projects/mes-zwq into projects/mes-test
Reviewed-on: #65
2023-11-07 15:49:59 +08:00
zwq
97e6a665de 更新仓库 2023-11-07 15:49:33 +08:00
6e1bf994c2 bug 2023-11-07 15:49:07 +08:00
298789bf24 Merge pull request 'projects/mes-zjl' (#64) from projects/mes-zjl into projects/mes-test
Reviewed-on: #64
2023-11-06 13:43:22 +08:00
876f7d8f3c merge test 2023-11-06 13:42:09 +08:00
5695c3db90 成品发货 2023-11-06 13:37:52 +08:00
9537c55f0e Merge pull request 'projects/mes-dy' (#63) from projects/mes-dy into projects/mes-test
Reviewed-on: #63
2023-11-06 12:57:09 +08:00
helloDy
1d38a560ec Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-06 12:55:03 +08:00
helloDy
0ae3c66dc3 基础核心 2023-11-06 12:54:28 +08:00
e49084d85d Merge pull request '更新仓库管理' (#62) from projects/mes-zwq into projects/mes-test
Reviewed-on: #62
2023-11-04 16:40:59 +08:00
zwq
0deb38647e 更新仓库管理 2023-11-04 16:40:16 +08:00
5521f07c18 Merge pull request 'projects/mes-zjl' (#61) from projects/mes-zjl into projects/mes-test
Reviewed-on: #61
2023-11-03 17:02:04 +08:00
14d426b020 merge test 2023-11-03 17:01:14 +08:00
046a5eea32 成品发货 2023-11-03 16:59:07 +08:00
b468204f88 Merge pull request 'projects/mes-dy' (#60) from projects/mes-dy into projects/mes-test
Reviewed-on: #60
2023-11-03 15:38:59 +08:00
helloDy
e5978d1700 merge 2023-11-03 11:16:30 +08:00
helloDy
91eb13af26 客商信息、人事相关 2023-11-03 11:15:12 +08:00
fe29043ab1 Merge pull request 'projects/mes-lb' (#59) from projects/mes-lb into projects/mes-test
Reviewed-on: #59
2023-11-01 09:45:17 +08:00
lb
2075b42427 'merge' 2023-11-01 09:39:25 +08:00
lb
c851188989 update before hand over 2023-11-01 09:37:47 +08:00
Melete
0fa310609e update 设备备品备件+巡检 2023-10-31 22:34:10 +08:00
lb
57a4ca96e7 add 2023-10-31 17:49:39 +08:00
lb
af868a7cd7 update 设备基础配置,设备保养 2023-10-30 16:51:37 +08:00
cb1ad9edec Merge pull request 'projects/mes-zhp' (#57) from projects/mes-zhp into projects/mes-test
Reviewed-on: #57
2023-10-30 11:04:40 +08:00
‘937886381’
34e8178ddc 解决合并冲突 2023-10-30 10:50:21 +08:00
‘937886381’
6c094b2a2e 修改bug 2023-10-30 10:48:32 +08:00
lb
4a796130d0 update 设备采集配置 2023-10-30 10:47:06 +08:00
60f65e6f85 Merge pull request 'projects/mes-lb' (#56) from projects/mes-lb into projects/mes-test
Reviewed-on: #56
2023-10-30 10:37:41 +08:00
lb
3bf8150764 Merge branch 'projects/mes-test' into projects/mes-lb 2023-10-30 10:36:13 +08:00
lb
bacf2eab0b update 2023-10-30 10:35:09 +08:00
8155a78649 Merge pull request 'projects/mes-zjl' (#55) from projects/mes-zjl into projects/mes-test
Reviewed-on: #55
2023-10-30 10:33:43 +08:00
013c08710c merge test 2023-10-30 10:32:51 +08:00
00fba0a83b 2023.10.30提测能源&班组 2023-10-30 10:26:54 +08:00
c71613f3fc Merge pull request 'projects/mes-dy' (#54) from projects/mes-dy into projects/mes-test
Reviewed-on: #54
2023-10-27 16:19:19 +08:00
helloDy
4615e975e8 merge 2023-10-27 16:17:28 +08:00
helloDy
e961bf6cfa 物料模块 2023-10-27 16:16:13 +08:00
lb
216aa6291d update 设备管理-基础配置-设备分组绑定 2023-10-27 14:24:47 +08:00
lb
66660bfef7 update 2023-10-26 17:01:09 +08:00
lb
d25261b256 move coreEquipment 2023-10-26 15:14:00 +08:00
lb
583b934511 delete some files 2023-10-26 14:07:36 +08:00
55e023d0a8 Merge pull request 'projects/mes-lb' (#53) from projects/mes-lb into projects/mes-test
Reviewed-on: #53
2023-10-26 11:34:28 +08:00
lb
503e988f7b merge again 2023-10-26 11:32:29 +08:00
lb
06e8a72f80 merge mes-test 2023-10-26 11:30:07 +08:00
lb
6c348202a1 update extend process 2023-10-26 11:28:24 +08:00
lb
5ba186b0c6 update 2023-10-25 17:02:43 +08:00
lb
e153d7e077 update 流程图 2023-10-24 17:07:32 +08:00
lb
3c31e5d63a done 新建工序 2023-10-24 15:56:15 +08:00
619cf9e1ce Merge pull request 'projects/mes-zjl' (#52) from projects/mes-zjl into projects/mes-test
Reviewed-on: #52
2023-10-24 15:22:19 +08:00
392c1ea09b merge test 2023-10-24 15:21:27 +08:00
ac4565e587 班组&能源基础 2023-10-24 15:16:20 +08:00
lb
6006ae13d9 update flow 2023-10-24 11:17:07 +08:00
74d5646d65 Merge pull request '包装管理' (#51) from projects/mes-zhp into projects/mes-test
Reviewed-on: #51
2023-10-23 08:57:17 +08:00
‘937886381’
2c3bdde403 包装管理 2023-10-23 08:42:46 +08:00
lb
106d0ed89c merge server 2023-10-20 17:03:06 +08:00
lb
cfbd00b560 update process 2023-10-20 17:00:49 +08:00
lb
a787935263 add process flow and process node 2023-10-20 16:03:40 +08:00
lb
15da20fac7 add 添加一个缓存方案 2023-10-20 14:22:46 +08:00
lb
6b4e906e75 update process flow 2023-10-19 16:40:36 +08:00
lb
d121e408af add 工艺流程列表 2023-10-19 11:13:37 +08:00
lb
f8baaa8955 update ui 2023-10-17 17:02:53 +08:00
lb
416d4bb390 update 2023-10-17 15:27:08 +08:00
lb
fe7821cbd8 update 核心模块-厂务-设备 2023-10-17 15:22:17 +08:00
1092 changed files with 129912 additions and 53653 deletions

View File

@@ -1,19 +1,35 @@
###
# @Author: Do not edit
# @Date: 2023-08-29 09:40:39
# @LastEditTime: 2024-11-25 14:31:39
# @LastEditors: zwq
# @LastEditTime: 2024-03-13 14:57:16
# @LastEditors: zhp
# @Description:
###
# 开发环境配置
ENV = 'development'
# 页面标题
VUE_APP_TITLE = 智能监控分析系统
VUE_APP_TITLE = MES系统
# 芋道管理系统/开发环境
# VUE_APP_BASE_API = 'http://192.168.8.22:48080'
VUE_APP_BASE_API = 'http://172.16.33.65:48082'
# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
# VUE_APP_BASE_API = 'http://192.168.1.20:48080'
# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
# VUE_APP_BASE_API = 'http://192.168.1.49:48082'
# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
# VUE_APP_BASE_API = 'http://192.168.1.104:48082'
VUE_APP_BASE_API = 'http://192.168.0.33:48082'
# VUE_APP_BASE_API = 'http://192.168.1.62:48082'
# VUE_APP_BASE_API = 'http://192.168.1.78:48082'
# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
# socket地址
VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -21,11 +37,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 多租户的开关
VUE_APP_TENANT_ENABLE = true
# 验证码的开关
VUE_APP_CAPTCHA_ENABLE = true
# 文档的开关
VUE_APP_DOC_ENABLE = true
# 百度统计
# VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab

View File

@@ -1,3 +1,4 @@
# 开发环境配置
ENV = 'development'
@@ -13,9 +14,6 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 多租户的开关
VUE_APP_TENANT_ENABLE = true
# 验证码的开关
VUE_APP_CAPTCHA_ENABLE = true
# 文档的开关
VUE_APP_DOC_ENABLE = true

View File

@@ -1,34 +1,35 @@
###
# @Author: zwq
# @Date: 2024-03-27 15:49:55
# @LastEditors: zwq
# @LastEditTime: 2024-10-30 11:08:47
# @Author: zhp
# @Date: 2023-11-07 19:11:40
# @LastEditTime: 2023-11-16 16:40:59
# @LastEditors: zhp
# @Description:
###
# 生产环境配置
ENV = 'production'
# 页面标题
VUE_APP_TITLE = 智能监控分析系统
VUE_APP_TITLE = MES系统
# 芋道管理系统/生产环境
# VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = ''
VUE_APP_BASE_API = '/prod-api'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
# socket地址
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# 根据服务器或域名修改
# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
# PUBLIC_PATH = 'http://192.168.0.33:8888/'
PUBLIC_PATH = ''
# 二级部署路径
VUE_APP_APP_NAME ='yudao-admin'
# VUE_APP_APP_NAME ='yudao-admin'
# 多租户的开关
VUE_APP_TENANT_ENABLE = true
# 验证码的开关
VUE_APP_CAPTCHA_ENABLE = true
# 文档的开关
VUE_APP_DOC_ENABLE = false

12
.env.production Normal file
View File

@@ -0,0 +1,12 @@
###
# @Author: zhp
# @Date: 2023-10-30 14:18:30
# @LastEditTime: 2023-11-02 16:16:09
# @LastEditors: zhp
# @Description:
###
# just a flag
ENV = 'production'
# base api
# VUE_APP_BASE_API = '/api'

View File

@@ -1,23 +1,32 @@
NODE_ENV = production
# 生产环境配置
ENV = 'production'
# 页面标题
VUE_APP_TITLE = 产线监控系统
VUE_APP_TITLE = MES系统
# 测试环境配置
ENV = 'staging'
# 芋道管理系统/生产环境
VUE_APP_BASE_API = '/prod-api'
# 芋道管理系统/测试环境
VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
# dcs地址
VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
# socket地址
VUE_APP_Socket_API = 'ws://10.70.2.2:8080'
# 静态资源地址
PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
# 积木报表指向地址
VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
# socket地址
VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
# 根据服务器或域名修改
PUBLIC_PATH = ''
# 二级部署路径
# VUE_APP_APP_NAME ='yudao-admin'
# 多租户的开关
VUE_APP_TENANT_ENABLE = true
# 验证码的开关
VUE_APP_CAPTCHA_ENABLE = true
# 文档的开关
VUE_APP_DOC_ENABLE = false

View File

@@ -17,9 +17,6 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/'
# 多租户的开关
VUE_APP_TENANT_ENABLE = true
# 验证码的开关
VUE_APP_CAPTCHA_ENABLE = true
# 文档的开关
VUE_APP_DOC_ENABLE = true

View File

@@ -8,7 +8,7 @@
"local": "vue-cli-service serve --mode local",
"dev": "vue-cli-service serve --mode dev",
"front": "vue-cli-service serve --mode front",
"build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode prod",
"build:prod": "vue-cli-service build --mode prod",
"build:stage": "vue-cli-service build --mode stage",
"build:dev": "vue-cli-service build --mode dev",
"build:static": "vue-cli-service build --mode static",
@@ -41,20 +41,19 @@
"url": "https://github.com/YunaiV/ruoyi-vue-pro"
},
"dependencies": {
"@antv/x6": "^2.15.3",
"@babel/parser": "7.18.4",
"@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.27.2",
"benz-amr-recorder": "^1.1.5",
"bpmn-js-token-simulation": "0.10.0",
"chinese-lunar": "^0.1.4",
"clipboard": "2.0.8",
"code-brick-zj": "^1.0.2",
"code-brick-zj": "^1.0.5",
"core-js": "^3.26.0",
"crypto-js": "^4.0.0",
"diagram-js": "^12.3.0",
"echarts": "5.4.0",
"el-tree-transfer": "^2.4.7",
"element-ui": "2.15.12",
"file-saver": "^2.0.5",
"fuse.js": "6.6.2",
@@ -73,6 +72,7 @@
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
"throttle-debounce": "2.1.0",
"uuid": "^9.0.1",
"video.js": "^8.5.2",
"vue": "2.7.14",
"vue-count-to": "1.0.13",
@@ -81,6 +81,7 @@
"vue-plugin-hiprint": "0.0.54-fix",
"vue-quill-editor": "^3.0.6",
"vue-router": "3.4.9",
"vue-seamless-scroll": "^1.1.23",
"vue-video-player": "^5.0.2",
"vuedraggable": "2.24.3",
"vuex": "3.6.2",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 37 KiB

View File

@@ -8,6 +8,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<link rel="stylesheet" type="text/css" media="print" href="<%= BASE_URL %>print-lock.css">
<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
<meta http-equiv="Expires" content="0">
<meta http-equiv="Pragma" content="no-cache">
<meta http-equiv="Cache-control" content="no-cache">
<meta http-equiv="Cache" content="no-cache">
<title>
<%= webpackConfig.name %>
</title>

Binary file not shown.

View File

@@ -0,0 +1,60 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-03 15:25:55
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建异常警告
export function createcoreAlarmLog(data) {
return request({
url: '/base/core-alarm-log/create',
method: 'post',
data: data
})
}
// 更新异常警告
export function updatecoreAlarmLog(data) {
return request({
url: '/base/core-alarm-log/update',
method: 'put',
data: data
})
}
// 删除异常警告
export function deletecoreAlarmLog(id) {
return request({
url: '/base/core-alarm-log/delete?id=' + id,
method: 'delete'
})
}
// 获得异常警告
export function getcoreAlarmLog(id) {
return request({
url: '/base/core-alarm-log/get?id=' + id,
method: 'get'
})
}
// 获得警告分页
export function getcoreAlarmLogPage(query) {
return request({
url: '/base/core-alarm-log/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getcoreAlarmLogList(query) {
return request({
url: '/base/core-alarm-log/list',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-02 20:25:36
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建客户
export function createCustomer(data) {
return request({
url: '/base/core-customer/create',
method: 'post',
data: data
})
}
// 更新客户
export function updateCustomer(data) {
return request({
url: '/base/core-customer/update',
method: 'put',
data: data
})
}
// 删除客户
export function deleteCustomer(id) {
return request({
url: '/base/core-customer/delete?id=' + id,
method: 'delete'
})
}
// 获得客户
export function getCustomer(id) {
return request({
url: '/base/core-customer/get?id=' + id,
method: 'get'
})
}
// 获得客户code
export function getCode() {
return request({
url: '/base/core-customer/getCode',
method: 'get'
})
}
// 获得客户分页
export function getCustomerPage(query) {
return request({
url: '/base/core-customer/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCustomerList(query) {
return request({
url: '/base/core-customer/listAll',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-10-30 14:37:28
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建部门
export function createCoreDepartment(data) {
return request({
url: '/base/core-department/create',
method: 'post',
data: data
})
}
// 更新部门
export function updateCoreDepartment(data) {
return request({
url: '/base/core-department/update',
method: 'put',
data: data
})
}
// 删除部门
export function deleteCoreDepartment(id) {
return request({
url: '/base/core-department/delete?id=' + id,
method: 'delete'
})
}
// 获得部门
export function getCoreDepartment(id) {
return request({
url: '/base/core-department/get?id=' + id,
method: 'get'
})
}
// 获得部门code
export function getCode() {
return request({
url: '/base/core-department/getCode',
method: 'get'
})
}
// 获得部门分页
export function getCoreDepartmentPage(query) {
return request({
url: '/base/core-department/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCoreDepartmentList(query) {
return request({
url: '/base/core-department/listAll',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,95 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-12-14 10:57:24
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建原料
export function createHotMaterial(data) {
return request({
url: '/base/core-hot-material/create',
method: 'post',
data: data
})
}
// 更新原料
export function updateHotMaterial(data) {
return request({
url: '/base/core-hot-material/update',
method: 'put',
data: data
})
}
// 删除原料
export function deleteHotMaterial(id) {
return request({
url: '/base/core-hot-material/delete?id=' + id,
method: 'delete'
})
}
// 获得原料
export function getHotMaterial(id) {
return request({
url: '/base/core-hot-material/get?id=' + id,
method: 'get'
})
}
// 获得原料code
export function getCode() {
return request({
url: '/base/core-hot-material/getCode',
method: 'get'
})
}
// 获得原料分页
export function getHotMaterialPage(query) {
return request({
url: '/base/core-hot-material/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getHotMaterialList(query) {
return request({
url: '/base/core-hot-material/listAll',
method: 'get',
params: query
})
}
// 创建原料质量检测条目
export function createHotMaterialCheck(data) {
return request({
url: '/base/core-hot-material-check/create',
method: 'post',
data: data
})
}
// 更新原料质量检测条目
export function updateHotMaterialCheck(data) {
return request({
url: '/base/core-hot-material-check/update',
method: 'put',
data: data
})
}
// 获得质量检测条目列表
export function getHotCheckList(query) {
return request({
url: '/base/core-hot-material-check/listByMaterial',
method: 'get',
params: query
})
}

68
src/api/base/coreMajor.js Normal file
View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-10-31 15:11:25
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建专业
export function createCoreMajor(data) {
return request({
url: '/base/core-major/create',
method: 'post',
data: data
})
}
// 更新专业
export function updateCoreMajor(data) {
return request({
url: '/base/core-major/update',
method: 'put',
data: data
})
}
// 删除专业
export function deleteCoreMajor(id) {
return request({
url: '/base/core-major/delete?id=' + id,
method: 'delete'
})
}
// 获得专业
export function getCoreMajor(id) {
return request({
url: '/base/core-major/get?id=' + id,
method: 'get'
})
}
// 获得专业code
export function getCode() {
return request({
url: '/base/core-major/getCode',
method: 'get'
})
}
// 获得专业分页
export function getCoreMajorPage(query) {
return request({
url: '/base/core-major/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCoreMajorList(query) {
return request({
url: '/base/core-major/listAll',
method: 'get',
params: query
})
}

111
src/api/base/coreProduct.js Normal file
View File

@@ -0,0 +1,111 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-04 10:42:50
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建产品
export function createCoreProduct(data) {
return request({
url: '/base/core-product/create',
method: 'post',
data: data
})
}
// 更新产品
export function updateCoreProduct(data) {
return request({
url: '/base/core-product/update',
method: 'put',
data: data
})
}
// 删除产品
export function deleteCoreProduct(id) {
return request({
url: '/base/core-product/delete?id=' + id,
method: 'delete'
})
}
// 获得产品
export function getCoreProduct(id) {
return request({
url: '/base/core-product/get?id=' + id,
method: 'get'
})
}
// 获得产品code
export function getCode() {
return request({
url: '/base/core-product/getCode',
method: 'get'
})
}
// 获得产品分页
export function getCoreProductPage(query) {
return request({
url: '/base/core-product/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCoreProductList(query) {
return request({
url: '/base/core-product/listAll',
method: 'get',
params: query
})
}
// 创建产品属性
export function createCoreProductAttr(data) {
return request({
url: '/base/core-product-attr/create',
method: 'post',
data: data
})
}
// 更新产品属性
export function updateCoreProductAttr(data) {
return request({
url: '/base/core-product-attr/update',
method: 'put',
data: data
})
}
// 删除产品属性
export function deleteCoreProductAttr(id) {
return request({
url: '/base/core-product-attr/delete?id=' + id,
method: 'delete'
})
}
// 获得产品属性
export function getCoreProductAttr(id) {
return request({
url: '/base/core-product-attr/get?id=' + id,
method: 'get'
})
}
// 获得产品属性分页
export function getCoreProductAttrPage(query) {
return request({
url: '/base/core-product-attr/page',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-03 19:06:15
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建产线
export function createCorePL(data) {
return request({
url: '/base/core-production-line/create',
method: 'post',
data: data
})
}
// 更新产线
export function updateCorePL(data) {
return request({
url: '/base/core-production-line/update',
method: 'put',
data: data
})
}
// 删除产线
export function deleteCorePL(id) {
return request({
url: '/base/core-production-line/delete?id=' + id,
method: 'delete'
})
}
// 获得产线
export function getCorePL(id) {
return request({
url: '/base/core-production-line/get?id=' + id,
method: 'get'
})
}
// 获得产线code
export function getCode() {
return request({
url: '/base/core-production-line/getCode',
method: 'get'
})
}
// 获得产线分页
export function getCorePLPage(query) {
return request({
url: '/base/core-production-line/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCorePLList(query) {
return request({
url: '/base/core-production-line/listAll',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-03 10:39:44
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建供应商
export function createCoreSupplier(data) {
return request({
url: '/base/core-supplier/create',
method: 'post',
data: data
})
}
// 更新供应商
export function updateCoreSupplier(data) {
return request({
url: '/base/core-supplier/update',
method: 'put',
data: data
})
}
// 删除供应商
export function deleteCoreSupplier(id) {
return request({
url: '/base/core-supplier/delete?id=' + id,
method: 'delete'
})
}
// 获得供应商
export function getCoreSupplier(id) {
return request({
url: '/base/core-supplier/get?id=' + id,
method: 'get'
})
}
// 获得供应商code
export function getCode() {
return request({
url: '/base/core-supplier/getCode',
method: 'get'
})
}
// 获得供应商分页
export function getCoreSupplierPage(query) {
return request({
url: '/base/core-supplier/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCoreSupplierList(query) {
return request({
url: '/base/core-supplier/listAll',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,164 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-15 17:19:19
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建工单
export function createCoreWO(data) {
return request({
url: '/base/core-work-order/create',
method: 'post',
data: data
})
}
// 更新工单
export function updateCoreWO(data) {
return request({
url: '/base/core-work-order/update',
method: 'put',
data: data
})
}
// 删除工单
export function deleteCoreWO(id) {
return request({
url: '/base/core-work-order/delete?id=' + id,
method: 'delete'
})
}
// 获得工单
export function getCoreWO(id) {
return request({
url: '/base/core-work-order/get?id=' + id,
method: 'get'
})
}
// 获得工单code
export function getCode() {
return request({
url: '/base/core-work-order/getCode',
method: 'get'
})
}
// 获得工单分页
export function getCoreWOPage(query) {
return request({
url: '/base/core-work-order/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCoreWOList(query) {
return request({
url: '/base/core-work-order/listbyfilter',
method: 'get',
params: query
})
}
// 根据工单id获得所有列表
export function getCoreWOListById(ids) {
return request({
url: '/base/core-work-order/list?ids='+ ids ,
method: 'get'
})
}
// 创建工单预使用原料
export function createCoreWOMa(data) {
return request({
url: '/base/core-work-order-material/create',
method: 'post',
data: data
})
}
// 更新工单预使用原料
export function updateCoreWOMa(data) {
return request({
url: '/base/core-work-order-material/update',
method: 'put',
data: data
})
}
// 删除工单预使用原料
export function deleteCoreWOMa(id) {
return request({
url: '/base/core-work-order-material/delete?id=' + id,
method: 'delete'
})
}
// 获得工单预使用原料
export function getCoreWOMa(id) {
return request({
url: '/base/core-work-order-material/get?id=' + id,
method: 'get'
})
}
// 获得工单预使用原料分页
export function getCoreWOMaPage(query) {
return request({
url: '/base/core-work-order-material/page',
method: 'get',
params: query
})
}
// 获得预计用料信息分页
export function getMaterialBomPage(query) {
return request({
url: '/base/material-product-bom/bomUseNum',
method: 'get',
params: query
})
}
// 获得订单分页
export function getConOrderList(query) {
return request({
url: '/base/order/listConOrder',
method: 'get',
params: query
})
}
// 改变工单状态 激活暂停完成作废
export function statusChange(data) {
return request({
url: '/base/core-work-order/statusChange',
method: 'post',
data: data
})
}
// 创建分配产量
export function createConCoreWOr(data) {
return request({
url: '/base/core-order-con-work-order/create',
method: 'post',
data: data
})
}
// 修改分配产量
export function updateConCoreWOr(data) {
return request({
url: '/base/core-order-con-work-order/update',
method: 'put',
data: data
})
}

103
src/api/base/coreWorker.js Normal file
View File

@@ -0,0 +1,103 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-02 19:49:52
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建员工
export function createCoreWorker(data) {
return request({
url: '/base/core-worker/create',
method: 'post',
data: data
})
}
// 更新员工
export function updateCoreWorker(data) {
return request({
url: '/base/core-worker/update',
method: 'put',
data: data
})
}
// 删除员工
export function deleteCoreWorker(id) {
return request({
url: '/base/core-worker/delete?id=' + id,
method: 'delete'
})
}
// 获得员工
export function getCoreWorker(id) {
return request({
url: '/base/core-worker/get?id=' + id,
method: 'get'
})
}
// 获得员工code
export function getCode() {
return request({
url: '/base/core-worker/getCode',
method: 'get'
})
}
// 获得员工分页
export function getCoreWorkerPage(query) {
return request({
url: '/base/core-worker/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCoreWorkerList(query) {
return request({
url: '/base/core-worker/listAll',
method: 'get',
params: query
})
}
// 创建员工--专业
export function createWoBindMa(data) {
return request({
url: '/base/core-worker-bind-major/create',
method: 'post',
data: data
})
}
// 更新员工--专业
export function updateWoBindMa(data) {
return request({
url: '/base/core-worker-bind-major/update',
method: 'put',
data: data
})
}
// 删除员工--专业
export function deleteWoBindMa(id) {
return request({
url: '/base/core-worker-bind-major/delete?id=' + id,
method: 'delete'
})
}
// 获得员工--专业分页
export function getWoBindMaPage(query) {
return request({
url: '/base/core-worker-bind-major/page',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-03 19:18:00
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建工段
export function createCWSection(data) {
return request({
url: '/base/core-workshop-section/create',
method: 'post',
data: data
})
}
// 更新工段
export function updateCWSection(data) {
return request({
url: '/base/core-workshop-section/update',
method: 'put',
data: data
})
}
// 删除工段
export function deleteCWSection(id) {
return request({
url: '/base/core-workshop-section/delete?id=' + id,
method: 'delete'
})
}
// 获得工段
export function getCWSection(id) {
return request({
url: '/base/core-workshop-section/get?id=' + id,
method: 'get'
})
}
// 获得工段code
export function getCode() {
return request({
url: '/base/core-workshop-section/getCode',
method: 'get'
})
}
// 获得工段分页
export function getCWSectionPage(query) {
return request({
url: '/base/core-workshop-section/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getCWSectionList(query) {
return request({
url: '/base/core-workshop-section/listAll',
method: 'get',
params: query
})
}

8
src/api/base/customer.js Normal file
View File

@@ -0,0 +1,8 @@
import request from '@/utils/request'
// 获得所有客户列表
export function getCustomerList() {
return request({
url: '/base/core-customer/listAll',
method: 'get'
})
}

100
src/api/base/delivery.js Normal file
View File

@@ -0,0 +1,100 @@
// 成品发货
import request from '@/utils/request'
// 获得成品发货清单分页
export function deliveryLogPage(data) {
return request({
url: '/extend/delivery-log/page',
method: 'post',
data: data
})
}
// 获取发货进度分页
export function deliveryProgressPage(data) {
return request({
url: '/extend/delivery-progress/page',
method: 'post',
data: data
})
}
// 获取订单列表
export function listOrderList(query) {
return request({
url: '/extend/delivery-log/listOrderList',
method: 'get',
params: query
})
}
// 获取发货进度分页
export function deliveryLogDetPage(data) {
return request({
url: '/extend/delivery-log-det/page',
method: 'post',
data: data
})
}
// 创建成品发货清单
export function deliveryLogCreate(data) {
return request({
url: '/extend/delivery-log/create',
method: 'post',
data: data
})
}
// 更新成品发货清单
export function deliveryLogUpdate(data) {
return request({
url: '/extend/delivery-log/update',
method: 'put',
data: data
})
}
// 获得成品发货清单
export function getDeliveryLog(query) {
return request({
url: '/extend/delivery-log/get',
method: 'get',
params: query
})
}
// 删除成品发货清单
export function deliveryLogDelete(query) {
return request({
url: '/extend/delivery-log/delete',
method: 'delete',
params: query
})
}
// 装车
export function deliveryLogDetCreate(data) {
return request({
url: '/extend/delivery-log-det/create',
method: 'post',
data: data
})
}
// 获得一条发货详细
export function deliveryLogDetGet(query) {
return request({
url: '/extend/delivery-log-det/get',
method: 'get',
params: query
})
}
// 编辑发货详情
export function deliveryLogDetUpdate(data) {
return request({
url: '/extend/delivery-log-det/update',
method: 'put',
data: data
})
}

View File

@@ -1,18 +1,11 @@
/*
* @Author: zwq
* @Date: 2024-04-11 15:00:03
* @LastEditors: zwq
* @LastEditTime: 2024-04-12 10:25:30
* @Description:
*/
import request from '@/utils/request'
// 获得分页数据
export function energyQuantityManualPage(query) {
export function energyQuantityManualPage(data) {
return request({
url: '/base/energy-quantity-manual/page',
method: 'get',
params: query
method: 'post',
data: data
})
}
@@ -53,34 +46,11 @@ export function energyQuantityManualDelete(query) {
}
//导出
export function energyQuantityManualExport(query) {
export function energyQuantityManualExport(data) {
return request({
url: '/base/energy-quantity-manual/export-excel',
method: 'get',
params: query,
method: 'post',
data: data,
responseType: 'blob'
})
}
// 获得能源表名配置分页
export function energyTablePage() {
return request({
url: '/base/energy-type-meter-bind/list',
method: 'get',
})
}
// 获得能源表名配置
export function energyTableGet(query) {
return request({
url: '/base/energy-type-meter-bind/list',
method: 'get',
params: query
})
}
// 更新能源表名配置
export function energyTableUpdate(data) {
return request({
url: '/base/energy-type-meter-bind/update',
method: 'put',
data: data
})
}
}

View File

@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 创建设备
export function createEquipment(data) {
return request({
url: '/base/equipment/create',
url: '/base/core-equipment/create',
method: 'post',
data: data
})
@@ -12,7 +12,7 @@ export function createEquipment(data) {
// 更新设备
export function updateEquipment(data) {
return request({
url: '/base/equipment/update',
url: '/base/core-equipment/update',
method: 'put',
data: data
})
@@ -21,7 +21,7 @@ export function updateEquipment(data) {
// 删除设备
export function deleteEquipment(id) {
return request({
url: '/base/equipment/delete?id=' + id,
url: '/base/core-equipment/delete?id=' + id,
method: 'delete'
})
}
@@ -29,7 +29,7 @@ export function deleteEquipment(id) {
// 获得设备
export function getEquipment(id) {
return request({
url: '/base/equipment/get?id=' + id,
url: '/base/core-equipment/get?id=' + id,
method: 'get'
})
}
@@ -37,7 +37,7 @@ export function getEquipment(id) {
// 获得设备分页
export function getEquipmentPage(query) {
return request({
url: '/base/equipment/page',
url: '/base/core-equipment/page',
method: 'get',
params: query
})
@@ -46,7 +46,7 @@ export function getEquipmentPage(query) {
// 导出设备 Excel
export function exportEquipmentExcel(query) {
return request({
url: '/base/equipment/export-excel',
url: '/base/core-equipment/export-excel',
method: 'get',
params: query,
responseType: 'blob'
@@ -55,7 +55,7 @@ export function exportEquipmentExcel(query) {
// 获得所有设备列表
export function getEquipmentAll() {
return request({
url: '/base/equipment/listAll',
url: '/base/core-equipment/listAll',
method: 'get'
})
}

View File

@@ -1,10 +1,3 @@
/*
* @Author: zwq
* @Date: 2024-10-29 09:47:40
* @LastEditors: zwq
* @LastEditTime: 2025-02-26 16:27:48
* @Description:
*/
import request from '@/utils/request'
// 创建实时数据采集配置
@@ -59,11 +52,3 @@ export function exportEquipmentPlcExcel(query) {
responseType: 'blob'
})
}
// 获得code
export function getCode() {
return request({
url: '/base/equipment-group/getCode',
method: 'get'
})
}

View File

@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 创建设备类型
export function createEquipmentType(data) {
return request({
url: '/base/equipment-type/create',
url: '/base/core-equipment-type/create',
method: 'post',
data: data
})
@@ -12,7 +12,7 @@ export function createEquipmentType(data) {
// 更新设备类型
export function updateEquipmentType(data) {
return request({
url: '/base/equipment-type/update',
url: '/base/core-equipment-type/update',
method: 'put',
data: data
})
@@ -21,7 +21,7 @@ export function updateEquipmentType(data) {
// 删除设备类型
export function deleteEquipmentType(id) {
return request({
url: '/base/equipment-type/delete?id=' + id,
url: '/base/core-equipment-type/delete?id=' + id,
method: 'delete'
})
}
@@ -29,7 +29,7 @@ export function deleteEquipmentType(id) {
// 获得设备类型
export function getEquipmentType(id) {
return request({
url: '/base/equipment-type/get?id=' + id,
url: '/base/core-equipment-type/get?id=' + id,
method: 'get'
})
}
@@ -37,7 +37,7 @@ export function getEquipmentType(id) {
// 获得设备类型分页
export function getEquipmentTypePage(query) {
return request({
url: '/base/equipment-type/page',
url: '/base/core-equipment-type/page',
method: 'get',
params: query
})
@@ -46,7 +46,7 @@ export function getEquipmentTypePage(query) {
// 导出设备类型 Excel
export function exportEquipmentTypeExcel(query) {
return request({
url: '/base/equipment-type/export-excel',
url: '/base/core-equipment-type/export-excel',
method: 'get',
params: query,
responseType: 'blob'

View File

@@ -1,15 +1,8 @@
/*
* @Author: zwq
* @Date: 2024-10-29 09:47:40
* @LastEditors: zwq
* @LastEditTime: 2025-02-12 09:25:11
* @Description:
*/
import request from '@/utils/request'
// 获得工厂产线工段设备树形结构
export function getTree() {
return request({
url: '/base/factory/getTree',
url: '/base/core-factory/getTree',
method: 'get'
})
}

View File

@@ -51,13 +51,6 @@ export function getCode() {
})
}
// 获得可用的班次列表
export function listClassesEnabled() {
return request({
url: '/base/group-classes/listEnable',
method: 'get'
})
}
// 导出班次基础信息 Excel
export function exportGroupClassesExcel(query) {
return request({

View File

@@ -1,125 +0,0 @@
import request from '@/utils/request'
// 创建排班计划配置基础信息
export function createGroupPlan(data) {
return request({
url: '/base/group-scheduling-plan/create',
method: 'post',
data: data
})
}
// 更新排班计划配置基础信息
export function updateGroupPlan(data) {
return request({
url: '/base/group-scheduling-plan/update',
method: 'put',
data: data
})
}
// 删除排班计划配置基础信息
export function deleteGroupPlan(id) {
return request({
url: '/base/group-scheduling-plan/delete?id=' + id,
method: 'delete'
})
}
// 获得排班计划配置基础信息
export function getGroupPlan(id) {
return request({
url: '/base/group-scheduling-plan/get?id=' + id,
method: 'get'
})
}
// 获得排班计划配置基础信息分页
export function getGroupPlanPage(query) {
return request({
url: '/base/group-scheduling-plan/page',
method: 'get',
params: query
})
}
// 获得所有排班计划列表
export function groupPlanList() {
return request({
url: '/base/group-scheduling-plan/listAll',
method: 'get'
})
}
// 获得排班计划相关班组列表
export function groupPlanTeamList(id) {
return request({
url: '/base/group-scheduling-plan-team/teamListByPlanId?planId=' + id,
method: 'get'
})
}
// 获得排班计划相关班次列表
export function groupPlanClassesList(id) {
return request({
url: '/base/group-scheduling-plan-classes/classesListByPlanId?planId=' + id,
method: 'get'
})
}
// 获取code
export function getCode() {
return request({
url: '/base/group-scheduling-plan/getCode',
method: 'get'
})
}
// 导出排班计划配置基础信息 Excel
export function exportGroupPlanExcel(query) {
return request({
url: '/base/group-scheduling-plan/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 获得产线工段树形结构
export function getGroupPlanTree() {
return request({
url: '/base/group-scheduling-plan/getLineSectionTree',
method: 'get'
})
}
// 创建排班计划产线工段
export function createGroupPlanLine(data) {
return request({
url: '/base/group-scheduling-plan-line-section/createPlanLineSection',
method: 'post',
data: data
})
}
// 更新排班计划产线工段
export function updateGroupPlanLine(data) {
return request({
url: '/base/group-scheduling-plan-line-section/updatePlanLineSection',
method: 'put',
data: data
})
}
// 获得排班计划配置基础信息
export function getGroupPlanLine(id) {
return request({
url: '/base/group-scheduling-plan-line-section/getLineSectionByPlanId?planId=' + id,
method: 'get'
})
}
// 获得当前登录用户所在部门id
export function getLoginUserDeptId() {
return request({
url: '/base/group-scheduling-plan-line-section/getLoginUserDeptId',
method: 'get'
})
}

View File

@@ -1,60 +0,0 @@
import request from '@/utils/request'
// 创建排班规则基础信息
export function createGroupRule(data) {
return request({
url: '/base/group-scheduling-rule/create',
method: 'post',
data: data
})
}
// 作废排班规则
export function disableGroupRule(id) {
return request({
url: '/base/group-scheduling-rule/disable?id=' + id,
method: 'post',
})
}
// 更新排班规则基础信息
export function updateGroupRule(data) {
return request({
url: '/base/group-scheduling-rule/update',
method: 'put',
data: data
})
}
// 删除排班规则基础信息
export function deleteGroupRule(id) {
return request({
url: '/base/group-scheduling-rule/delete?id=' + id,
method: 'delete'
})
}
// 获得排班规则基础信息
export function getGroupRule(id) {
return request({
url: '/base/group-scheduling-rule/get?id=' + id,
method: 'get'
})
}
// 获得排班规则基础信息分页
export function getGroupRulePage(query) {
return request({
url: '/base/group-scheduling-rule/page',
method: 'get',
params: query
})
}
// 导出排班规则基础信息 Excel
export function exportGroupRuleExcel(query) {
return request({
url: '/base/group-scheduling-rule/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -59,6 +59,15 @@ export function listEnabled() {
})
}
// 获得可用的排班列表(根据车间筛选)
export function listEnabledByRoom(query) {
return request({
url: '/base/group-team/listEnabledByRoom',
method: 'get',
params: query
})
}
// 获得班组组员信息分页
export function groupTeamPage(query) {
return request({

View File

@@ -8,14 +8,7 @@ export function getPreset(query) {
params: query
})
}
// 获取某月预排班
export function getScheduling(query) {
return request({
url: '/base/group-team-scheduling/getScheduling',
method: 'get',
params: query
})
}
// 批量创建-更新排班信息
export function createOrUpdateList(data) {
return request({
@@ -33,22 +26,3 @@ export function autoSet(query) {
params: query
})
}
// 获得排班信息分页
export function schedulingPage(query) {
return request({
url: '/base/group-team-scheduling/page',
method: 'get',
params: query
})
}
// 导出Excel
export function exportSchedulingExcel(query) {
return request({
url: '/base/group-team-scheduling/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,13 +1,13 @@
/*
* @Author: zwq
* @Date: 2024-04-09 16:42:19
* @LastEditors: zwq
* @LastEditTime: 2024-04-10 14:33:52
* @Description:
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-10-24 11:22:28
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建
// 创建
export function createMaterial(data) {
return request({
url: '/base/material/create',
@@ -16,7 +16,7 @@ export function createMaterial(data) {
})
}
// 更新
// 更新
export function updateMaterial(data) {
return request({
url: '/base/material/update',
@@ -25,14 +25,7 @@ export function updateMaterial(data) {
})
}
// 获取code
export function getCode() {
return request({
url: '/base/material/autoCode',
method: 'POST'
})
}
// 删除原料
// 删除物料
export function deleteMaterial(id) {
return request({
url: '/base/material/delete?id=' + id,
@@ -40,7 +33,7 @@ export function deleteMaterial(id) {
})
}
// 获得
// 获得
export function getMaterial(id) {
return request({
url: '/base/material/get?id=' + id,
@@ -48,7 +41,15 @@ export function getMaterial(id) {
})
}
// 获得原料分页
// 获得物料code
export function getCode() {
return request({
url: '/base/material/getMaterialCode',
method: 'get'
})
}
// 获得物料分页
export function getMaterialPage(query) {
return request({
url: '/base/material/page',
@@ -56,20 +57,65 @@ export function getMaterialPage(query) {
params: query
})
}
// 获得原料列表
export function getMaterialList() {
// 获得物料列表
export function getMaterialList(query) {
return request({
url: '/base/material/list',
url: '/base/material/listbyfilter',
method: 'get',
params: query
})
}
// 导出原料 Excel
export function exportMaterialExcel(query) {
// 获得供应商所有列表
export function getSupplierList(query) {
return request({
url: '/base/material/export-excel',
url: '/base/core-supplier/listAll',
method: 'get',
params: query,
responseType: 'blob'
params: query
})
}
// 获得物料属性列表
export function getMaterialAttrList(query) {
return request({
url: '/base/material-attr/page',
method: 'get',
params: query
})
}
// 创建物料属性
export function createMaterialAttr(data) {
return request({
url: '/base/material-attr/create',
method: 'post',
data: data
})
}
// 更新物料属性
export function updateMaterialAttr(data) {
return request({
url: '/base/material-attr/update',
method: 'put',
data: data
})
}
// 删除物料属性
export function deleteMaterialAttr(id) {
return request({
url: '/base/material-attr/delete?id=' + id,
method: 'delete'
})
}
// 获得物料属性
export function getMaterialAttr(query) {
return request({
url: '/base/material-attr/get',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-10-24 17:09:59
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建物料批次
export function createMaterialDate(data) {
return request({
url: '/base/material-date/create',
method: 'post',
data: data
})
}
// 更新物料批次
export function updateMaterialDate(data) {
return request({
url: '/base/material-date/update',
method: 'put',
data: data
})
}
// 删除物料批次
export function deleteMaterialDate(id) {
return request({
url: '/base/material-date/delete?id=' + id,
method: 'delete'
})
}
// 获得物料批次
export function getMaterialDate(id) {
return request({
url: '/base/material-date/getDetail?id=' + id,
method: 'get'
})
}
// 获得物料批次code
export function getCode() {
return request({
url: '/base/material-date/getMaterialDateCode',
method: 'get'
})
}
// 获得物料批次分页
export function getMaterDatePage(query) {
return request({
url: '/base/material-date/page',
method: 'get',
params: query
})
}
// 获得物料批次列表
export function getMaterDateList(query) {
return request({
url: '/base/material-date/listbyfilter',
method: 'get',
params: query
})
}

View File

@@ -1,68 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-09 16:42:19
* @LastEditors: zwq
* @LastEditTime: 2024-04-10 14:31:46
* @Description:
*/
import request from '@/utils/request'
// 创建原料
export function createMaterialPricing(data) {
return request({
url: '/base/material-pricing/create',
method: 'post',
data: data
})
}
// 更新原料
export function updateMaterialPricing(data) {
return request({
url: '/base/material-pricing/update',
method: 'put',
data: data
})
}
// 获取code
export function getCode() {
return request({
url: '/base/material-pricing/autoCode',
method: 'POST'
})
}
// 删除原料
export function deleteMaterialPricing(id) {
return request({
url: '/base/material-pricing/delete?id=' + id,
method: 'delete'
})
}
// 获得原料
export function getMaterialPricing(id) {
return request({
url: '/base/material-pricing/get?id=' + id,
method: 'get'
})
}
// 获得原料分页
export function getMaterialPricingPage(query) {
return request({
url: '/base/material-pricing/page',
method: 'get',
params: query
})
}
// 导出原料 Excel
export function exportMaterialPricingExcel(query) {
return request({
url: '/base/material-pricing/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,120 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-11-27 17:54:28
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建产品Bom
export function createMaterialPB(data) {
return request({
url: '/base/material-product-bom/create',
method: 'post',
data: data
})
}
// 更新产品Bom
export function updateMaterialPB(data) {
return request({
url: '/base/material-product-bom/update',
method: 'put',
data: data
})
}
// 删除产品Bom
export function deleteMaterialPB(id) {
return request({
url: '/base/material-product-bom/delete?id=' + id,
method: 'delete'
})
}
// 获得产品Bom
export function getMaterialPB(id) {
return request({
url: '/base/material-product-bom/get?id=' + id,
method: 'get'
})
}
// 获得产品Bomcode
export function getCode() {
return request({
url: '/base/material-product-bom/getMaterialProductBomCode',
method: 'get'
})
}
// 获得产品Bom分页
export function getMaterialPBPage(query) {
return request({
url: '/base/material-product-bom/page',
method: 'get',
params: query
})
}
// 获得产品Bom列表
export function getMaterialPBList(query) {
return request({
url: '/base/material-product-bom/listbyfilter',
method: 'get',
params: query
})
}
// 获得产品列表
export function getProList(query) {
return request({
url: '/base/core-product/listAll',
method: 'get',
params: query
})
}
// 获得产品Bom详细分页
export function getProBomList(query) {
return request({
url: '/base/material-product-bom-det/page',
method: 'get',
params: query
})
}
// 创建产品Bom详细
export function createMaterialPBDet(data) {
return request({
url: '/base/material-product-bom-det/create',
method: 'post',
data: data
})
}
// 更新产品Bom详细
export function updateMaterialPBDet(data) {
return request({
url: '/base/material-product-bom-det/update',
method: 'put',
data: data
})
}
// 删除产品Bom详细
export function deleteMaterialPBDet(id) {
return request({
url: '/base/material-product-bom-det/delete?id=' + id,
method: 'delete'
})
}
// 获得产品Bom详细
export function getMaterialPBDet(id) {
return request({
url: '/base/material-product-bom-det/get?id=' + id,
method: 'get'
})
}

View File

@@ -0,0 +1,69 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 11:50:46
* @LastEditTime: 2023-10-26 09:32:21
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建物料使用记录
export function createMaterialLog(data) {
return request({
url: '/base/material-use-log/create',
method: 'post',
data: data
})
}
// 更新物料使用记录
export function updateMaterialLog(data) {
return request({
url: '/base/material-use-log/update',
method: 'put',
data: data
})
}
// 获得物料使用记录
export function getMaterialLog(id) {
return request({
url: '/base/material-use-log/getDetail?id=' + id,
method: 'get'
})
}
// 获得物料使用记录分页
export function getMaterialLogPage(query) {
return request({
url: '/base/material-use-log/page',
method: 'get',
params: query
})
}
// 获得所有设备列表
export function getEqListAll(query) {
return request({
url: '/base/core-equipment/listAll',
method: 'get',
params: query
})
}
// 获得所有员工列表
export function getworkerAll(query) {
return request({
url: '/base/core-worker/listAll',
method: 'get',
params: query
})
}
// 删除物料使用记录
export function deleteMaterialLog(id) {
return request({
url: '/base/material-use-log/delete?id=' + id,
method: 'delete'
})
}

68
src/api/base/modelType.js Normal file
View File

@@ -0,0 +1,68 @@
/*
* @Author: zhp
* @Date: 2023-10-18 09:33:57
* @LastEditTime: 2023-10-18 16:02:09
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建包装
export function createPackingType(data) {
return request({
url: '/base/packaging-print-type/create',
method: 'post',
data: data
})
}
// 获得包装code
export function getCode() {
return request({
url: '/base/packaging-print-log/getPackagingSerialCode',
method: 'get'
})
}
// 更新包装
export function updatePackingType(data) {
return request({
url: '/base/packaging-print-type/update',
method: 'put',
data: data
})
}
// 删除包装
export function deletePackingType(id) {
return request({
url: '/base/packaging-print-type/delete?id=' + id,
method: 'delete'
})
}
// 获得包装
export function getPackingType(id) {
return request({
url: '/base/packaging-print-type/get?id=' + id,
method: 'get'
})
}
// 获得包装分页
export function getPackingTypePage(query) {
return request({
url: '/base/packaging-print-type/page',
method: 'get',
params: query
})
}
// 导出包装 Excel
export function exportPackingExcel(query) {
return request({
url: '/base/packaging-print-type/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,72 @@
import request from '@/utils/request'
// 获得集团订单分页
export function getOrderGroupPage(query) {
return request({
url: '/base/order-group/page',
method: 'get',
params: query
})
}
// 获得集团订单
export function getOrderGroup(query) {
return request({
url: '/base/order-group/get',
method: 'get',
params: query
})
}
// 更新集团订单
export function updateOrderGroup(data) {
return request({
url: '/base/order-group/update',
method: 'put',
data: data
})
}
// 创建集团订单
export function createOrderGroup(data) {
return request({
url: '/base/order-group/create',
method: 'post',
data: data
})
}
// 修改集团订单状态,结束-终止-作废用
export function groupOrderStatusSet(data) {
return request({
url: '/base/order-group/groupOrderStatusSet',
method: 'put',
data: data
})
}
// 获得集团订单详情
export function orderGroupDetail(query) {
return request({
url: '/base/order-group/getDetail',
method: 'get',
params: query
})
}
// 创建集团订单与厂务订单表关联表 一对多
export function orderConGroupOrder(data) {
return request({
url: '/base/order-con-group-order/create',
method: 'post',
data: data
})
}
// 订单监控
export function orderGroupMonitor(query) {
return request({
url: '/base/order-group/orderGroupMonitor',
method: 'get',
params: query
})
}

175
src/api/base/orderManage.js Normal file
View File

@@ -0,0 +1,175 @@
import request from '@/utils/request'
// 条件获得订单列表
export function orderList(query) {
return request({
url: '/base/order/listbyfilter',
method: 'get',
params: query
})
}
// 获得订单列表
export function getOrderList(query) {
return request({
url: '/base/order/list',
method: 'get',
params: query
})
}
// 获得订单列表
export function getFreeOrderList() {
return request({
url: '/base/order/getFreeOrderList',
method: 'get'
})
}
// 条件获得工单列表
export function workOrderList(query) {
return request({
url: '/base/core-work-order/listbyfilter',
method: 'get',
params: query
})
}
// 条件获得工单列表
export function getFreeWOlist(query) {
return request({
url: '/base/core-work-order/getFreeWOlist',
method: 'get',
params: query
})
}
// 获得订单分页
export function getOrderPage(query) {
return request({
url: '/base/order/page',
method: 'get',
params: query
})
}
// 获取订单code
export function getOrderCode() {
return request({
url: '/base/order/getOrderCode',
method: 'get'
})
}
// 获取工单code
export function getWorkOrderCode() {
return request({
url: '/base/order/getWorkOrderCode',
method: 'get'
})
}
// 获得订单
export function getOrderById(query) {
return request({
url: '/base/order/get',
method: 'get',
params: query
})
}
// 获得工艺流程列表
export function getProcessFlowList() {
return request({
url: '/extend/process-flow/listAll',
method: 'get'
})
}
// 创建订单
export function orderCreate(data) {
return request({
url: '/base/order/create',
method: 'post',
data: data
})
}
// 更新订单
export function orderUpdate(data) {
return request({
url: '/base/order/update',
method: 'put',
data: data
})
}
// 删除订单
export function orderDelete(query) {
return request({
url: '/base/order/delete',
method: 'delete',
params: query
})
}
// 修改订单状态,结束-终止-作废用
export function orderStatusSet(data) {
return request({
url: '/base/order/orderStatusSet',
method: 'put',
data: data
})
}
// 下发订单绑定的穿工单id新建不传
export function orderIssue(data) {
return request({
url: '/base/order/issue',
method: 'post',
data: data
})
}
// 获得工单
export function getWorkOrderById(query) {
return request({
url: '/base/core-work-order/get',
method: 'get',
params: query
})
}
// 获得所有客户列表
export function customerList() {
return request({
url: '/base/core-customer/listAll',
method: 'get'
})
}
// 获得订单详情
export function orderDetail(query) {
return request({
url: '/base/order/getDetail',
method: 'get',
params: query
})
}
// 产品bom消耗信息
export function bomUseNum(query) {
return request({
url: '/base/material-product-bom/bomUseNum',
method: 'get',
params: query
})
}
// 完成订单
export function orderFinish(query) {
return request({
url: '/base/order/finish',
method: 'post',
params: query
})
}

View File

@@ -0,0 +1,92 @@
/*
* @Author: zhp
* @Date: 2023-10-18 09:33:57
* @LastEditTime: 2023-10-18 16:18:12
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建包装
export function createPacking(data) {
return request({
url: '/base/packaging-print-log/create',
method: 'post',
data: data
})
}
// 获得包装code
export function getCode() {
return request({
url: '/base/packaging-print-log/getPackagingSerialCode',
method: 'get'
})
}
// 更新包装
export function updatePacking(data) {
return request({
url: '/base/packaging-print-log/update',
method: 'put',
data: data
})
}
// 删除包装
export function deletePacking(id) {
return request({
url: '/base/packaging-print-log/delete?id=' + id,
method: 'delete'
})
}
// 获得包装
export function getPacking(id) {
return request({
url: '/base/packaging-print-log/get?id=' + id,
method: 'get'
})
}
// 获得包装分页
export function getPackingPage(query) {
return request({
url: '/base/packaging-print-log/page',
method: 'get',
params: query
})
}
// 导出包装 Excel
export function exportPackingExcel(query) {
return request({
url: '/base/packaging-print-log/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
export function getWorkOrderList(query) {
return request({
url: '/base/core-work-order/listbyfilter',
method: 'get',
params: query,
})
}
export function getCustomerList(query) {
return request({
url: '/base/core-customer/listAll',
method: 'get',
params: query,
})
}
export function getModelList(query) {
return request({
url: '/base/packaging-print-model/listbyfilter',
method: 'get',
params: query,
})
}

View File

@@ -0,0 +1,92 @@
/*
* @Author: zhp
* @Date: 2023-10-18 09:33:57
* @LastEditTime: 2023-10-19 15:28:00
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建包装
export function createPackingModel(data) {
return request({
url: '/base/packaging-print-model/create',
method: 'post',
data: data
})
}
// 获得包装code
// export function getCode() {
// return request({
// url: '/base/packaging-print-log/getPackagingSerialCode',
// method: 'get'
// })
// }
// 更新包装
export function updatePackingModel(data) {
return request({
url: '/base/packaging-print-model/update',
method: 'put',
data: data
})
}
// 删除包装
export function deletePackingModel(id) {
return request({
url: '/base/packaging-print-model/delete?id=' + id,
method: 'delete'
})
}
// 获得包装
export function getPackingModel(id) {
return request({
url: '/base/packaging-print-model/get?id=' + id,
method: 'get'
})
}
// 获得包装分页
export function getPackingModelPage(query) {
return request({
url: '/base/packaging-print-model/page',
method: 'get',
params: query
})
}
// 导出包装 Excel
// export function exportPackingExcel(query) {
// return request({
// url: '/base/packaging-print-log/export-excel',
// method: 'get',
// params: query,
// responseType: 'blob'
// })
// }
// export function getWorkOrderList(query) {
// return request({
// url: '/base/core-work-order/listbyfilter',
// method: 'get',
// params: query,
// })
// }
// export function getCustomerList(query) {
// return request({
// url: '/base/core-customer/listAll',
// method: 'get',
// params: query,
// })
// }
export function getTypeList(query) {
return request({
url: '/base/packaging-print-type/listbyfilter',
method: 'get',
params: query,
})
}

8
src/api/base/product.js Normal file
View File

@@ -0,0 +1,8 @@
import request from '@/utils/request'
// 获得产品列表
export function getProductAll() {
return request({
url: '/base/core-product/listAll',
method: 'get'
})
}

View File

@@ -1,23 +1,8 @@
/*
* @Author: zwq
* @Date: 2024-03-27 15:49:55
* @LastEditors: zwq
* @LastEditTime: 2024-09-10 14:36:19
* @Description:
*/
import request from '@/utils/request'
// 获得所有工厂产线列表
export function getLineAll() {
return request({
url: '/base/production-line/listAll',
url: '/base/core-production-line/listAll',
method: 'get'
})
}
// 获得产线分页
export function getLinePage(query) {
return request({
url: '/base/production-line/page',
method: 'get',
params: query
})
}
}

View File

@@ -0,0 +1,125 @@
/*
* @Author: zhp
* @Date: 2023-11-06 15:38:12
* @LastEditTime: 2023-12-15 15:29:16
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建质量检测类型基础
export function createQualityHotMaterial(data) {
return request({
url: '/base/quality-hot-material/create',
method: 'post',
data: data
})
}
// 更新质量检测类型基础
export function updateQualityHotMaterial(data) {
return request({
url: '/base/quality-hot-material/update',
method: 'put',
data: data
})
}
// 删除质量检测类型基础
export function deleteQualityHotMaterial(id) {
return request({
url: '/base/quality-hot-material/delete?id=' + id,
method: 'delete'
})
}
// 获得质量检测类型基础
export function getQualityHotMaterial(id) {
return request({
url: '/base/quality-hot-material/get?id=' + id,
method: 'get'
})
}
// 获得质量检测类型基础分页
export function getQualityHotMaterialPage(query) {
return request({
url: 'base/quality-hot-material/page',
method: 'get',
params: query
})
}
// 导出质量检测类型基础 Excel
// export function exportQualityScrapTypeExcel(query) {
// return request({
// url: '/base/quality-scrap-type/export-excel',
// method: 'get',
// params: query,
// responseType: 'blob'
// })
// }
export function getCode(query) {
return request({
url: '/base/quality-hot-material/getCode',
method: 'get',
params: query
})
}
export function getHotMaterialAllList(query) {
return request({
url: '/base/core-hot-material/listAll',
method: 'get',
params: query
})
}
export function getSupplierList(query) {
return request({
url: '/base/core-supplier/listAll',
method: 'get',
params: query
})
}
export function getWorkerList(query) {
return request({
url: '/base/core-worker/listAll',
method: 'get',
params: query
})
}
export function getMaterialCheckList(query) {
return request({
url: '/base/core-hot-material-check/listByMaterial',
method: 'get',
params: query
})
}
export function createQualityHotMaterialDet(query){
return request({
url: '/base/quality-hot-material-det/create',
method: 'post',
data: query
})
}
export function updateQualityHotMaterialDet(query){
return request({
url: '/base/quality-hot-material-det/listbyfilter',
method: 'put',
data: query
})
}
export function getQualityHotMaterialDetList(query){
return request({
url: '/base/quality-hot-material-det/listbyfilter',
method: 'get',
params: query
})
}

View File

@@ -1,10 +1,17 @@
/*
* @Author: zhp
* @Date: 2023-12-04 14:10:37
* @LastEditTime: 2023-12-14 10:06:03
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建安灯按钮16键对应
export function createQualityInspectionBoxBtn(data) {
return request({
url: '/base/quality-inspection-box-btn/create',
method: 'post',
url: '/base/quality-inspection-box-btn/updateBatch',
method: 'put',
data: data
})
}
@@ -12,7 +19,7 @@ export function createQualityInspectionBoxBtn(data) {
// 更新安灯按钮16键对应
export function updateQualityInspectionBoxBtn(data) {
return request({
url: '/base/quality-inspection-box-btn/update',
url: '/base/quality-inspection-box-btn/updateBatch',
method: 'put',
data: data
})
@@ -37,7 +44,7 @@ export function getQualityInspectionBoxBtn(id) {
// 获得安灯按钮16键对应分页
export function getQualityInspectionBoxBtnPage(query) {
return request({
url: '/base/quality-inspection-box-btn/page',
url: '/base/quality-inspection-box-btn/listGroupByLineSection',
method: 'get',
params: query
})
@@ -52,3 +59,19 @@ export function exportQualityInspectionBoxBtnExcel(query) {
responseType: 'blob'
})
}
export function getAllDetByTypeList(query) {
return request({
url: '/base/quality-scrap-det/scrapMap',
method: 'get',
params: query,
})
}
export function getListByLineSection(query) {
return request({
url: '/base/quality-inspection-box-btn/detListByLineSection',
method: 'get',
params: query,
})
}

View File

@@ -0,0 +1,91 @@
/*
* @Author: zhp
* @Date: 2023-12-04 14:10:37
* @LastEditTime: 2024-01-31 09:56:09
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建安灯按钮16键对应
export function createQualityInspectionBoxBtn(data) {
return request({
url: '/base/quality-inspection-box-btn/updateBatch',
method: 'put',
data: data
})
}
// 更新安灯按钮16键对应
export function updateQualityInspectionBoxBtn(data) {
return request({
url: '/base/quality-inspection-box-btn-auth/update',
method: 'put',
data: data
})
}
// 删除安灯按钮16键对应
export function deleteQualityInspectionBoxBtn(id) {
return request({
url: 'base/quality-inspection-box-btn-auth/delete?userId=' + id,
method: 'delete'
})
}
// 获得安灯按钮16键对应
export function getQualityInspectionBoxBtn(id) {
return request({
url: 'base/quality-inspection-box-btn-auth/get?userId=' + id,
method: 'get'
})
}
// 获得安灯按钮16键对应分页
export function getQualityInspectionBoxBtnPage(query) {
return request({
url: '/base/quality-inspection-box-btn/listGroupByLineSection',
method: 'get',
params: query
})
}
// 导出安灯按钮16键对应 Excel
export function exportQualityInspectionBoxBtnExcel(query) {
return request({
url: '/base/quality-inspection-box-btn/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
export function getAllDetByTypeList(query) {
return request({
url: '/base/quality-scrap-det/scrapMap',
method: 'get',
params: query,
})
}
export function getListByLineSection(query) {
return request({
url: '/base/quality-inspection-box-btn/detListByLineSection',
method: 'get',
params: query,
})
}
export function getUserList(query) {
return request({
url: 'base/quality-inspection-box-btn-auth/getUserList',
method: 'get',
params: query,
})
}
export function getPage(query) {
return request({
url: 'base/quality-inspection-box-btn-auth/page',
method: 'post',
data:query
})
}

View File

@@ -1,3 +1,10 @@
/*
* @Author: zhp
* @Date: 2023-10-17 09:26:38
* @LastEditTime: 2023-11-20 15:50:08
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建质量检测信息基础
@@ -52,3 +59,11 @@ export function exportQualityInspectionDetExcel(query) {
responseType: 'blob'
})
}
export function getQualityInspectionDetList(query) {
return request({
url: '/base/quality-inspection-det/listAll',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,70 @@
/*
* @Author: zhp
* @Date: 2023-11-06 15:38:12
* @LastEditTime: 2023-12-08 09:46:55
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建质量检测类型基础
export function createQualityScrapDet(data) {
return request({
url: '/base/quality-scrap-det/create',
method: 'post',
data: data
})
}
// 更新质量检测类型基础
export function updateQualityScrapDet(data) {
return request({
url: '/base/quality-scrap-det/update',
method: 'put',
data: data
})
}
// 删除质量检测类型基础
export function deleteQualityScrapDet(id) {
return request({
url: '/base/quality-scrap-det/delete?id=' + id,
method: 'delete'
})
}
// 获得质量检测类型基础
export function getQualityScrapDet(id) {
return request({
url: '/base/quality-scrap-det/get?id=' + id,
method: 'get'
})
}
// 获得质量检测类型基础分页
export function getQualityScrapDetPage(query) {
return request({
url: '/base/quality-scrap-det/page',
method: 'get',
params: query
})
}
// 导出质量检测类型基础 Excel
export function exportQualityScrapTypeExcel(query) {
return request({
url: '/base/quality-scrap-type/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
export function getCode(query) {
return request({
url: '/base/quality-scrap-det/getCode',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,100 @@
/*
* @Author: zhp
* @Date: 2023-11-07 15:02:37
* @LastEditTime: 2023-11-07 18:32:07
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建质量检测类型基础
export function createQualityScrapLog(data) {
return request({
url: '/base/quality-scrap-log/create',
method: 'post',
data: data
})
}
// 更新质量检测类型基础
export function updateQualityScrapLog(data) {
return request({
url: '/base/quality-scrap-log/update',
method: 'put',
data: data
})
}
// 删除质量检测类型基础
export function deleteQualityScrapLog(id) {
return request({
url: '/base/quality-scrap-log/delete?id=' + id,
method: 'delete'
})
}
// 获得质量检测类型基础
export function getQualityScrapLog(id) {
return request({
url: '/base/quality-scrap-log/get?id=' + id,
method: 'get'
})
}
// 获得质量检测类型基础分页
export function getQualityScrapLogPage(query) {
return request({
url: '/base/quality-scrap-log/page',
method: 'get',
params: query
})
}
// 导出质量检测类型基础 Excel
export function exportQualityScrapTypeExcel(query) {
return request({
url: '/base/quality-scrap-type/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
export function getCode(query) {
return request({
url: '/base/quality-scrap-log/getCode',
method: 'get',
params: query
})
}
export function getWorkOrderList(query) {
return request({
url: '/base/core-work-order/listbyfilter',
method: 'get',
params: query,
})
}
export function getTeamList(query) {
return request({
url: '/base/group-team/listAll',
method: 'get',
params: query,
})
}
export function getLineList(query) {
return request({
url: '/base/core-production-line/listAll',
method: 'get',
params: query,
})
}
export function getDetList(query) {
return request({
url: '/base/quality-scrap-det/listAll',
method: 'get',
params: query,
})
}

View File

@@ -0,0 +1,76 @@
/*
* @Author: zhp
* @Date: 2023-11-04 18:27:11
* @LastEditTime: 2023-11-06 15:55:24
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建质量检测类型基础
export function createQualityScrapType(data) {
return request({
url: '/base/quality-scrap-type/create',
method: 'post',
data: data
})
}
// 更新质量检测类型基础
export function updateQualityScrapType(data) {
return request({
url: '/base/quality-scrap-type/update',
method: 'put',
data: data
})
}
// 删除质量检测类型基础
export function deleteQualityScrapType(id) {
return request({
url: '/base/quality-scrap-type/delete?id=' + id,
method: 'delete'
})
}
// 获得质量检测类型基础
export function getQualityScrapType(id) {
return request({
url: '/base/quality-scrap-type/get?id=' + id,
method: 'get'
})
}
// 获得质量检测类型基础分页
export function getQualityScrapTypePage(query) {
return request({
url: '/base/quality-scrap-type/page',
method: 'get',
params: query
})
}
// 导出质量检测类型基础 Excel
export function exportQualityScrapTypeExcel(query) {
return request({
url: '/base/quality-scrap-type/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
export function getCode(query) {
return request({
url: '/base/quality-scrap-type/getCode',
method: 'get',
params: query
})
}
export function getList(query) {
return request({
url: 'base/quality-scrap-type/listAll',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,8 @@
import request from '@/utils/request'
// 获得工单列表
export function workOrderList() {
return request({
url: '/base/core-work-order/listbyfilter',
method: 'get'
})
}

View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
// 获得所有产线工段列表
export function getWorkShopAll() {
return request({
url: '/base/workshop-section/listAll',
url: '/base/core-workshop-section/listAll',
method: 'get'
})
}

View File

@@ -1,48 +1,25 @@
/*
* @Author: zhp
* @Date: 2023-09-12 14:07:04
* @LastEditTime: 2025-01-08 15:47:17
* @LastEditors: zwq
* @LastEditTime: 2023-11-10 10:23:43
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
export function getYieldAnalysisPageData(data) {
export function getYieldAnalysisPageData(query) {
return request({
url: '/analysis/production-analysis/getOutput',
method: 'post',
data: data
url: '/base/core-production-line-rec-day/monthList',
method: 'get',
params: query
})
}
// 产线平衡分析
export function getCT(data) {
return request({
url: '/analysis/production-analysis/getCT',
url: '/analysis/equipment-analysis/getCT',
method: 'post',
data: data
})
}
// 获取产线平衡分析数据new
export function getNewCTNow(data) {
return request({
url: '/analysis/production-analysis/getNewCTNow',
method: 'post',
data: data,
});
}
// 获取产线平衡分析数据趋势图new
export function getNewCTCharts(data) {
return request({
url: '/analysis/production-analysis/getNewCTCharts',
method: 'post',
data: data
})
}
// 获取产线平衡分析数据设备listnew
export function getNewCTDet(data) {
return request({
url: '/analysis/production-analysis/getNewCTDet',
method: 'post',
data:data
});
}

View File

@@ -1,9 +1,16 @@
/*
* @Author: Do not edit
* @Date: 2023-10-21 10:11:01
* @LastEditTime: 2023-11-03 19:03:44
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建工厂
export function createFactory(data) {
return request({
url: '/base/factory/create',
url: '/base/core-factory/create',
method: 'post',
data: data
})
@@ -12,7 +19,7 @@ export function createFactory(data) {
// 更新工厂
export function updateFactory(data) {
return request({
url: '/base/factory/update',
url: '/base/core-factory/update',
method: 'put',
data: data
})
@@ -21,7 +28,7 @@ export function updateFactory(data) {
// 删除工厂
export function deleteFactory(id) {
return request({
url: '/base/factory/delete?id=' + id,
url: '/base/core-factory/delete?id=' + id,
method: 'delete'
})
}
@@ -29,21 +36,30 @@ export function deleteFactory(id) {
// 获得工厂
export function getFactory(id) {
return request({
url: '/base/factory/get?id=' + id,
url: '/base/core-factory/get?id=' + id,
method: 'get'
})
}
// 获得工厂code
export function getCode() {
return request({
url: '/base/factory/getCode',
url: '/base/core-factory/getCode',
method: 'get'
})
}
// 获得工厂分页
export function getFactoryPage(query) {
return request({
url: '/base/factory/page',
url: '/base/core-factory/page',
method: 'get',
params: query
})
}
// 获得所有列表
export function getFactoryList(query) {
return request({
url: '/base/core-factory/listAll',
method: 'get',
params: query
})
@@ -52,18 +68,9 @@ export function getFactoryPage(query) {
// 导出工厂 Excel
export function exportFactoryExcel(query) {
return request({
url: '/base/factory/export-excel',
url: '/base/core-factory/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 获取产线设备状态
export function getLineEqStatus(data) {
return request({
url: '/base/production-line/getLineEqStatus',
method: 'post',
data: data
})
}

View File

@@ -1,28 +0,0 @@
import request from '@/utils/request'
// 切换工艺
export function switchLineBindProcess(data) {
return request({
url: '/base/line-bind-process/switch',
method: 'put',
data: data
})
}
// 获得产线工艺目前生产工艺
export function getLineBindProcessPage(query) {
return request({
url: '/base/line-bind-process/nowList',
method: 'get',
params: query
})
}
// 获得产线工艺log分页
export function getLineBindProcessLogPage(query) {
return request({
url: '/base/line-bind-process/logPage',
method: 'get',
params: query
})
}

View File

@@ -16,14 +16,6 @@ export function switchLineBindProduct(data) {
data: data
})
}
// 切换产线是否可以自动
export function switchAutoProduct(data) {
return request({
url: '/base/line-bind-product/switchAuto',
method: 'put',
data: data
})
}
// 更新产线目前生产产品表 主要为更新
export function updateLineBindProduct(data) {
return request({

View File

@@ -1,9 +1,9 @@
/*
* @Author: Do not edit
* @Date: 2023-09-12 09:44:53
* @LastEditTime: 2025-01-07 09:57:36
* @LastEditors: zwq
* @Description:
* @LastEditTime: 2023-09-13 16:11:41
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
@@ -17,79 +17,9 @@ export function getPdlAutoReport(data) {
}
// 获得所有工厂产线列表
export function getPdList(id) {
export function getPdList() {
return request({
url: '/base/production-line/listAll' + (id ? '?id=' + id : ''),
url: '/base/production-line/listAll',
method: 'get'
})
}
// 获得产线自动报表
export function getLineAuto(data) {
return request({
url: '/monitoring/production-monitor/getPdlAutoReportNew',
method: 'post',
data: data
})
}
// 获得产品自动报表
export function getProductAuto(data) {
return request({
url: '/monitoring/production-monitor/getProcessAutoReportNew',
method: 'post',
data: data
})
}
export function getPdlAutoReportNewSearchNow(data) {
return request({
url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow',
method: 'post',
data: data,
timeout: 60000,
});
}
// 班组自动报表分页
export function getTeamReportPage(data) {
return request({
url: '/monitoring/team-auto-report/page',
method: 'post',
data: data
})
}
// 班组自动报表分页详细
export function getTeamReportPageDet(id) {
return request({
url: '/monitoring/team-auto-report/pageDet?id=' + id,
method: 'get',
})
}
// 获取产品当班数据
export function getProcessAutoReportGroup(data) {
return request({
url: '/monitoring/production-monitor/getProcessAutoReportGroup',
method: 'post',
data: data,
});
}
// 获取产品当天数据
export function getProcessAutoReportDay(data) {
return request({
url: '/monitoring/production-monitor/getProcessAutoReportDay',
method: 'post',
data: data,
});
}
// 获取产品历史数据
export function getProcessAutoReportNew(data) {
return request({
url: '/monitoring/production-monitor/getProcessAutoReportNew',
method: 'post',
data: data,
});
}
}

View File

@@ -1,9 +1,9 @@
/*
* @Author: Do not edit
* @Date: 2023-09-12 09:44:53
* @LastEditTime: 2025-03-03 10:43:34
* @LastEditors: zwq
* @Description:
* @LastEditTime: 2023-09-14 10:25:46
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
@@ -22,22 +22,4 @@ export function getPdList() {
url: '/base/production-line/listAll',
method: 'get'
})
}
// 产线统计数据查询-历史
export function getPdlAutoReportNewSearch(data) {
return request({
url: '/monitoring/production-monitor/getPdlAutoReportNewSearch',
method: 'post',
data: data
})
}
// 产线统计数据查询-当前
export function getPdlAutoReportNewSearchNow(data) {
return request({
url: '/monitoring/production-monitor/getPdlAutoReportNewSearchNow',
method: 'post',
data: data,
timeout: 60000,
})
}
}

View File

@@ -1,17 +1,17 @@
/*
* @Author: Do not edit
* @Date: 2023-09-12 09:44:53
* @LastEditTime: 2023-09-15 14:12:26
* @LastEditTime: 2023-11-06 18:57:05
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 获得近24小时产线生产数据
export function getPdlDataOneDay(data) {
export function getPdlDataOneDay(query) {
return request({
url: '/monitoring/production-monitor/getPdlDataOneDay',
method: 'post',
data: data
url: '/base/core-production-line-rec-hour/list24h',
method: 'get',
params: query
})
}

View File

@@ -14,79 +14,3 @@ export function getSectionDataSearch(data) {
data: data
})
}
// 获取下片日志分页数据
export function getDownLogPage(data) {
return request({
url: '/base/down-log/page',
method: 'get',
params: data,
});
}
// 获取下片日志历史数据
export function getDownLogHisData(data) {
return request({
url: '/base/down-log/pagehis',
method: 'get',
params: data,
});
}
// 导出下片日志Excel
export function exportDownLogData(query) {
return request({
url: '/base/down-log/export-excel',
method: 'get',
params: query,
responseType: 'blob',
});
}
// 获得所有工厂产线列表
export function getPdList() {
return request({
url: '/base/production-line/listAll',
method: 'get'
})
}
// 获得玻璃型号列表
export function getThick() {
return request({
url: '/base/down-log/thick',
method: 'get',
});
}
// 获得原片报表
export function getCostOriginRadioHisData(data) {
return request({
url: '/monitoring/cost-origin-ratio-his/page',
method: 'get',
params: data,
});
}
// 修改原片报表
export function editCostOriginRadioHisData(data) {
return request({
url: '/monitoring/cost-origin-ratio-his/update',
method: 'put',
data: data,
});
}
// 导出原片报表
export function exportCostOriginRadioHisData(data) {
return request({
url: '/monitoring/cost-origin-ratio-his/export-excel',
method: 'get',
params: data,
responseType: 'blob',
});
}

View File

@@ -1,54 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-09-06 14:35:13
* @Description:
*/
import request from '@/utils/request'
// 获得总成本统计-按日期分页
export function getCostSumPage(query) {
return request({
url: '/monitoring/cost-sum/page',
method: 'get',
params: query
})
}
// 更新总成本统计-按日期
export function updateCostSum(data) {
return request({
url: '/monitoring/cost-sum/update',
method: 'put',
data: data
})
}
// 获得原片成本统计成本查询分页
export function getRawCostStatisticsRealtimePage(query) {
return request({
url: '/monitoring/cost-sum/page',
method: 'get',
params: query
})
}
// 导出总成本统计-按日期 Excel
export function exportCostSumExcel(query) {
return request({
url: '/monitoring/cost-sum/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出原片成本统计-历史成本 Excel
export function exportRawCostStatisticsHisExcel(query) {
return request({
url: '/monitoring/cost-sum/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,55 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-09-06 15:00:09
* @Description:
*/
import request from '@/utils/request'
// 更新深加工良品率
export function updateDeepRatioHis(data) {
return request({
url: '/monitoring/cost-deep-ratio-his/update',
method: 'put',
data: data
})
}
// 获得深加工产线良品率
export function getDeepPDRatioHisPage(query) {
return request({
url: '/monitoring/cost-deep-ratio-his/page-pd',
method: 'get',
params: query
})
}
// 获得深加工工段良品率
export function getDeepWSRatioHisPage(query) {
return request({
url: '/monitoring/cost-deep-ratio-his/page-ws',
method: 'get',
params: query
})
}
// 导出深加工工段良品率 Excel
export function exportDeepWSRatioHisExcel(query) {
return request({
url: '/monitoring/cost-deep-ratio-his/export-excel-ws',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出深加工产线良品率 Excel
export function exportDeepPDRatioHisExcel(query) {
return request({
url: '/monitoring/cost-deep-ratio-his/export-excel-pd',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,53 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-04-19 16:11:19
* @Description:
*/
import request from '@/utils/request'
// 更新原片能源历史
export function updateEnergyHis(data) {
return request({
url: '/monitoring/cost-energy-his/update',
method: 'put',
data: data
})
}
// 获得原片能源历史分页
export function getEnergyHisPage(query) {
return request({
url: '/monitoring/cost-energy-his/page',
method: 'get',
params: query
})
}
// 获得原片能源-成本查询分页
export function getEnergyRealtimePage(query) {
return request({
url: '/monitoring/cost-energy-realtime/page',
method: 'get',
params: query
})
}
// 导出能源成本成本查询 Excel
export function exportEnergyRealtimeExcel(query) {
return request({
url: '/monitoring/cost-energy-realtime/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出能源成本历史 Excel
export function exportEnergyHisExcel(query) {
return request({
url: '/monitoring/cost-energy-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,54 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-09-06 15:19:24
* @Description:
*/
import request from '@/utils/request'
// 更新深加工能源历史
export function updateEnergyHis(data) {
return request({
url: '/monitoring/cost-deep-energy-his/update',
method: 'put',
data: data
})
}
// 获得深加工能源历史分页
export function getEnergyHisPage(query) {
return request({
url: '/monitoring/cost-deep-energy-his/page',
method: 'get',
params: query
})
}
// 获得深加工能源-成本查询分页
export function getEnergyRealtimePage(query) {
return request({
url: '/monitoring/cost-deep-energy-realtime/page',
method: 'get',
params: query
})
}
// 导出深加工能源成本成本查询 Excel
export function exportEnergyRealtimeExcel(query) {
return request({
url: '/monitoring/cost-deep-energy-realtime/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出深加工能源成本历史 Excel
export function exportEnergyHisExcel(query) {
return request({
url: '/monitoring/cost-deep-energy-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,78 @@
/*
* @Author: zwq
* @Date: 2023-11-23 14:57:00
* @LastEditors: zwq
* @LastEditTime: 2023-12-07 09:37:18
* @Description:
*/
import request from '@/utils/request'
// 创建能源自动记录报
export function createCostEneryAutoReport(data) {
return request({
url: '/extend/cost-enery-auto-report/create',
method: 'post',
data: data
})
}
// 更新能源自动记录报
export function updateCostEneryAutoReport(data) {
return request({
url: '/extend/cost-enery-auto-report/update',
method: 'put',
data: data
})
}
// 删除能源自动记录报
export function deleteCostEneryAutoReport(id) {
return request({
url: '/extend/cost-enery-auto-report/delete?id=' + id,
method: 'delete'
})
}
// 获得能源自动记录报
export function getCostEneryAutoReport(id) {
return request({
url: '/extend/cost-enery-auto-report/get?id=' + id,
method: 'get'
})
}
// 获得能源自动记录报分页历史
export function getCostEneryAutoReportPage(data) {
return request({
url: '/extend/cost-enery-auto-report/page',
method: 'post',
data: data
})
}
// 获得能源查询
export function getCostEneryAutoPage(data) {
return request({
url: '/extend/cost-energy-search/getData',
method: 'post',
data: data
})
}
// 导出能源自动记录报 Excel
export function exportCostEneryAutoReportExcel(data) {
return request({
url: '/extend/cost-enery-auto-report/export-excel',
method: 'post',
data: data,
responseType: 'blob'
})
}
// 导出能源自动记录报 Excel 查询
export function exportCostEneryExcel(data) {
return request({
url: '/extend/cost-energy-search/export-excel',
method: 'post',
data: data,
responseType: 'blob'
})
}

View File

@@ -1,54 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-09-05 13:55:30
* @Description:
*/
import request from '@/utils/request'
// 更新原料成本-历史
export function updateMaterialHis(data) {
return request({
url: '/monitoring/cost-material-his/update',
method: 'put',
data: data
})
}
// 获得原料成本-历史分页
export function getMaterialHisPage(query) {
return request({
url: '/monitoring/cost-material-his/page',
method: 'get',
params: query
})
}
// 获得原料成本-成本查询分页
export function getMaterialRealtimePage(query) {
return request({
url: '/monitoring/cost-material-realtime/page',
method: 'get',
params: query
})
}
// 导出原料成本成本查询 Excel
export function exportMaterialRealtimeExcel(query) {
return request({
url: '/monitoring/cost-material-realtime/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出原料成本历史 Excel
export function exportMaterialHisExcel(query) {
return request({
url: '/monitoring/cost-material-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,73 @@
import request from '@/utils/request'
// 创建原料成本自动统计报
export function createCostMaterialAutoReport(data) {
return request({
url: '/extend/cost-material-auto-report/create',
method: 'post',
data: data
})
}
// 更新原料成本自动统计报
export function updateCostMaterialAutoReport(data) {
return request({
url: '/extend/cost-material-auto-report/update',
method: 'put',
data: data
})
}
// 删除原料成本自动统计报
export function deleteCostMaterialAutoReport(id) {
return request({
url: '/extend/cost-material-auto-report/delete?id=' + id,
method: 'delete'
})
}
// 获得原料成本自动统计报
export function getCostMaterialAutoReport(id) {
return request({
url: '/extend/cost-material-auto-report/get?id=' + id,
method: 'get'
})
}
// 获得原料成本自动统计报分页历史
export function getCostMaterialAutoReportPage(data) {
return request({
url: '/extend/cost-material-auto-report/page',
method: 'post',
data: data
})
}
// 获得原料成本查询
export function getCostMaterialSearchPage(data) {
return request({
url: '/extend/cost-material-search/getData',
method: 'post',
data: data
})
}
// 导出原料成本自动统计报 Excel
export function exportCostMaterialAutoReportExcel(data) {
return request({
url: '/extend/cost-material-auto-report/export-excel',
method: 'post',
data: data,
responseType: 'blob'
})
}
// 导出原料成本自动统计报 Excel查询
export function exportCostMaterialSearch(data) {
return request({
url: '/extend/cost-material-search/export-excel',
method: 'post',
data: data,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,61 @@
/*
* @Author: zwq
* @Date: 2023-11-15 09:24:30
* @LastEditors: zwq
* @LastEditTime: 2023-12-05 14:38:48
* @Description:
*/
import request from '@/utils/request'
// 创建原料价位配置
export function createCostMaterialSet(data) {
return request({
url: '/extend/cost-material-set/create',
method: 'post',
data: data
})
}
// 更新原料价位配置
export function updateCostMaterialSet(data) {
return request({
url: '/extend/cost-material-set/update',
method: 'put',
data: data
})
}
// 删除原料价位配置
export function deleteCostMaterialSet(id) {
return request({
url: '/extend/cost-material-set/delete?id=' + id,
method: 'delete'
})
}
// 获得原料价位配置
export function getCostMaterialSet(id) {
return request({
url: '/extend/cost-material-set/get?id=' + id,
method: 'get'
})
}
// 获得原料价位配置分页
export function getCostMaterialSetPage(data) {
return request({
url: '/extend/cost-material-set/page',
method: 'POST',
data: data
})
}
// 导出原料价位配置 Excel
export function exportCostMaterialSetExcel(query) {
return request({
url: '/extend/cost-material-set/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,36 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-04-22 10:53:55
* @Description:
*/
import request from '@/utils/request'
// 更新原片良品率
export function updatecostOriginRatioHis(data) {
return request({
url: '/monitoring/cost-origin-ratio-his/update',
method: 'put',
data: data
})
}
// 获得原片良品率
export function getcostOriginRatioHisPage(query) {
return request({
url: '/monitoring/cost-origin-ratio-his/page',
method: 'get',
params: query
})
}
// 导出原片良品率 Excel
export function exportcostOriginRatioHisExcel(query) {
return request({
url: '/monitoring/cost-origin-ratio-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,53 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-04-19 14:24:17
* @Description:
*/
import request from '@/utils/request'
// 更新原片其他成本-历史
export function updateRawOthercostHis(data) {
return request({
url: '/monitoring/cost-othercost-his/update',
method: 'put',
data: data
})
}
// 获得原片其他成本-历史分页
export function getRawOthercostHisPage(query) {
return request({
url: '/monitoring/cost-othercost-his/page',
method: 'get',
params: query
})
}
// 获得原片其他成本-成本查询分页
export function getRawOthercostSunPage(query) {
return request({
url: '/monitoring/cost-othercost-log/page-sum',
method: 'get',
params: query
})
}
// 导出原片其他成本-成本查询 Excel
export function exportRawOthercostSunExcel(query) {
return request({
url: '/monitoring/cost-othercost-log/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出原片其他成本-历史 Excel
export function exportRawOthercostHisExcel(query) {
return request({
url: '/monitoring/cost-othercost-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,53 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-09-06 15:13:20
* @Description:
*/
import request from '@/utils/request'
// 更新深加工其他成本-历史
export function updateRawOthercostHis(data) {
return request({
url: '/monitoring/cost-deep-othercost-his/update',
method: 'put',
data: data
})
}
// 获得深加工其他成本-历史分页
export function getRawOthercostHisPage(query) {
return request({
url: '/monitoring/cost-deep-othercost-his/page',
method: 'get',
params: query
})
}
// 获得深加工其他成本-成本查询分页
export function getRawOthercostSunPage(query) {
return request({
url: '/monitoring/cost-deep-othercost-log/page-sum',
method: 'get',
params: query
})
}
// 导出深加工其他成本-成本查询 Excel
export function exportRawOthercostSunExcel(query) {
return request({
url: '/monitoring/cost-deep-othercost-log/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出深加工其他成本-历史 Excel
export function exportRawOthercostHisExcel(query) {
return request({
url: '/monitoring/cost-deep-othercost-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,68 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-15 17:01:20
* @LastEditors: zwq
* @LastEditTime: 2024-09-06 14:12:09
* @Description:
*/
import request from '@/utils/request'
// 创建原片其他成本-记录
export function createRawOthercostLog(data) {
return request({
url: '/monitoring/cost-othercost-log/create',
method: 'post',
data: data
})
}
// 更新原片其他成本-记录
export function updateRawOthercostLog(data) {
return request({
url: '/monitoring/cost-othercost-log/update',
method: 'put',
data: data
})
}
// 删除原片其他成本-记录
export function deleteRawOthercostLog(id) {
return request({
url: '/monitoring/cost-othercost-log/delete?id=' + id,
method: 'delete'
})
}
// 获得原片其他成本-记录
export function getRawOthercostLog(id) {
return request({
url: '/monitoring/cost-othercost-log/get?id=' + id,
method: 'get'
})
}
// 获得原片其他成本-记录分页
export function getRawOthercostLogPage(query) {
return request({
url: '/monitoring/cost-othercost-log/page',
method: 'get',
params: query
})
}
// 导出原片其他成本-记录 Excel
export function exportRawOthercostLogExcel(query) {
return request({
url: '/monitoring/cost-othercost-log/export-log-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 获得所有原片其他成本-记录列表
export function getRawOthercostLogAll() {
return request({
url: '/monitoring/cost-othercost-log/listAll',
method: 'get'
})
}

View File

@@ -1,68 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-15 17:01:20
* @LastEditors: zwq
* @LastEditTime: 2024-04-22 14:59:35
* @Description:
*/
import request from '@/utils/request'
// 创建深加工其他成本-记录
export function createRawOthercostLog(data) {
return request({
url: '/monitoring/cost-deep-othercost-log/create',
method: 'post',
data: data
})
}
// 更新深加工其他成本-记录
export function updateRawOthercostLog(data) {
return request({
url: '/monitoring/cost-deep-othercost-log/update',
method: 'put',
data: data
})
}
// 删除深加工其他成本-记录
export function deleteRawOthercostLog(id) {
return request({
url: '/monitoring/cost-deep-othercost-log/delete?id=' + id,
method: 'delete'
})
}
// 获得深加工其他成本-记录
export function getRawOthercostLog(id) {
return request({
url: '/monitoring/cost-deep-othercost-log/get?id=' + id,
method: 'get'
})
}
// 获得深加工其他成本-记录分页
export function getRawOthercostLogPage(query) {
return request({
url: '/monitoring/cost-deep-othercost-log/page',
method: 'get',
params: query
})
}
// 导出深加工其他成本-记录 Excel
export function exportRawOthercostLogExcel(query) {
return request({
url: '/monitoring/cost-deep-othercost-log/export-log-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 获得所有深加工其他成本-记录列表
export function getRawOthercostLogAll() {
return request({
url: '/monitoring/cost-deep-othercost-log/listAll',
method: 'get'
})
}

View File

@@ -1,53 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-09-02 14:43:30
* @Description:
*/
import request from '@/utils/request'
// 获得深加工成本分页
export function getDeepCostStatisticsPage(query) {
return request({
url: '/monitoring/cost-deep-cost-his/page',
method: 'get',
params: query
})
}
// 更新深加工成本-历史
export function updateDeepCostStatistics(data) {
return request({
url: '/monitoring/cost-deep-cost-his/update',
method: 'put',
data: data
})
}
// 获得深加工成本统计成本查询分页
export function getDeepCostStatisticsRealtimePage(query) {
return request({
url: '/monitoring/cost-deep-cost-realtime/page',
method: 'get',
params: query
})
}
// 导出深加工成本统计成本查询 Excel
export function exportDeepStatisticsRealtimeExcel(query) {
return request({
url: '/monitoring/cost-deep-cost-realtime/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出深加工成本统计-历史成本 Excel
export function exportDeepCostStatisticsHisExcel(query) {
return request({
url: '/monitoring/cost-deep-cost-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,68 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-15 17:01:20
* @LastEditors: zwq
* @LastEditTime: 2024-04-22 14:55:00
* @Description:
*/
import request from '@/utils/request'
// 创建深加工其他成本-配置
export function createRawOthercostRule(data) {
return request({
url: '/monitoring/cost-deep-othercost-rule/create',
method: 'post',
data: data
})
}
// 更新深加工其他成本-配置
export function updateRawOthercostRule(data) {
return request({
url: '/monitoring/cost-deep-othercost-rule/update',
method: 'put',
data: data
})
}
// 删除深加工其他成本-配置
export function deleteRawOthercostRule(id) {
return request({
url: '/monitoring/cost-deep-othercost-rule/delete?id=' + id,
method: 'delete'
})
}
// 获得深加工其他成本-配置
export function getRawOthercostRule(id) {
return request({
url: '/monitoring/cost-deep-othercost-rule/get?id=' + id,
method: 'get'
})
}
// 获得深加工其他成本-配置分页
export function getRawOthercostRulePage(query) {
return request({
url: '/monitoring/cost-deep-othercost-rule/page',
method: 'get',
params: query
})
}
// 导出深加工其他成本-配置 Excel
export function exportRawOthercostRuleExcel(query) {
return request({
url: '/monitoring/cost-deep-othercost-rule/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 获得所有深加工其他成本-配置列表
export function getRawOthercostRuleAll() {
return request({
url: '/monitoring/cost-deep-othercost-rule/listAll',
method: 'get'
})
}

View File

@@ -1,54 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-18 16:53:17
* @LastEditors: zwq
* @LastEditTime: 2024-09-06 14:35:13
* @Description:
*/
import request from '@/utils/request'
// 获得原片成本分页
export function getRawCostStatisticsPage(query) {
return request({
url: '/monitoring/cost-origincost-his/page',
method: 'get',
params: query
})
}
// 更新原片成本-历史
export function updateRawCostStatistics(data) {
return request({
url: '/monitoring/cost-origincost-his/update',
method: 'put',
data: data
})
}
// 获得原片成本统计成本查询分页
export function getRawCostStatisticsRealtimePage(query) {
return request({
url: '/monitoring/cost-origin-cost-realtime/page',
method: 'get',
params: query
})
}
// 导出原片成本统计成本查询 Excel
export function exportRawStatisticsRealtimeExcel(query) {
return request({
url: '/monitoring/cost-origin-cost-realtime/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出原片成本统计-历史成本 Excel
export function exportRawCostStatisticsHisExcel(query) {
return request({
url: '/monitoring/cost-origincost-his/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -1,68 +0,0 @@
/*
* @Author: zwq
* @Date: 2024-04-15 17:01:20
* @LastEditors: zwq
* @LastEditTime: 2024-04-18 15:39:12
* @Description:
*/
import request from '@/utils/request'
// 创建原片其他成本-配置
export function createRawOthercostRule(data) {
return request({
url: '/monitoring/cost-othercost-rule/create',
method: 'post',
data: data
})
}
// 更新原片其他成本-配置
export function updateRawOthercostRule(data) {
return request({
url: '/monitoring/cost-othercost-rule/update',
method: 'put',
data: data
})
}
// 删除原片其他成本-配置
export function deleteRawOthercostRule(id) {
return request({
url: '/monitoring/cost-othercost-rule/delete?id=' + id,
method: 'delete'
})
}
// 获得原片其他成本-配置
export function getRawOthercostRule(id) {
return request({
url: '/monitoring/cost-othercost-rule/get?id=' + id,
method: 'get'
})
}
// 获得原片其他成本-配置分页
export function getRawOthercostRulePage(query) {
return request({
url: '/monitoring/cost-othercost-rule/page',
method: 'get',
params: query
})
}
// 导出原片其他成本-配置 Excel
export function exportRawOthercostRuleExcel(query) {
return request({
url: '/monitoring/cost-othercost-rule/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 获得所有原片其他成本-配置列表
export function getRawOthercostRuleAll() {
return request({
url: '/monitoring/cost-othercost-rule/listAll',
method: 'get'
})
}

View File

@@ -0,0 +1,27 @@
/*
* @Author: Do not edit
* @Date: 2023-11-10 09:27:39
* @LastEditTime: 2023-11-10 09:30:00
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 获得设备统计分析
export function getEqAnalysis(query) {
return request({
url: '/analysis/equipment-analysis/statistics',
method: 'get',
params: query
})
}
// 导出设备统计分析
export function exportEqAnalysisExcel(query) {
return request({
url: '/analysis/equipment-analysis/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,60 @@
/*
* @Author: Do not edit
* @Date: 2023-11-08 15:56:52
* @LastEditTime: 2023-11-09 17:42:27
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 创建设备报警处理
export function createAlarmHand(data) {
return request({
url: '/base/equipment-alarm-hand/create',
method: 'post',
data: data
})
}
// 更新设备报警处理
export function updateAlarmHand(data) {
return request({
url: '/base/equipment-alarm-hand/update',
method: 'put',
data: data
})
}
// 删除设备报警处理
export function deleteAlarmHand(id) {
return request({
url: '/base/equipment-alarm-hand/delete?id=' + id,
method: 'delete'
})
}
//获得设备报警处理
export function getAlarmHand(id) {
return request({
url: '/base/equipment-alarm-hand/get?id=' + id,
method: 'get'
})
}
// 获得设备报警处理分页
export function getAlarmHandPage(query) {
return request({
url: '/base/equipment-alarm-hand/page',
method: 'get',
params: query
})
}
//获得设备报警记录
export function getAlarmLog(id) {
return request({
url: '/base/equipment-alarm-log/get?id=' + id,
method: 'get'
})
}

View File

@@ -1,9 +1,9 @@
/*
* @Author: Do not edit
* @Date: 2024-02-21 13:43:02
* @LastEditTime: 2024-04-30 10:07:59
* @LastEditors: zwq
* @Description:
* @LastEditTime: 2024-03-14 19:12:31
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
@@ -37,7 +37,7 @@ export function listByParentId(query) {
// 获得产线工段设备树形结构
export function getTree(query) {
return request({
url: '/base/factory/getTree',
url: '/base/core-factory/getTree',
method: 'get',
params: query
})

View File

@@ -0,0 +1,133 @@
/*
* @Author: Do not edit
* @Date: 2023-11-08 15:56:52
* @LastEditTime: 2024-02-28 18:16:56
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 根据设备获得所有巡检内容列表
export function getcheckAllList(query) {
return request({
url: '/base/equipment-check/listAll',
method: 'get',
params: query
})
}
// 创建设备巡检计划记录
export function createCheckLog(data) {
return request({
url: '/base/equipment-check-log/create',
method: 'post',
data: data
})
}
// 更新设备巡检计划记录
export function updateCheckLog(data) {
return request({
url: '/base/equipment-check-log/update',
method: 'put',
data: data
})
}
// 获得设备巡检计划记录
export function getEqCheckLog(id) {
return request({
url: '/base/equipment-check-log/get?id=' + id,
method: 'get'
})
}
// 导出设备巡检计划记录
export function exportCheckLogExcel(query) {
return request({
url: '/base/equipment-check-log/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出设备巡检单记录
export function exportCheckOrderExcel(query) {
return request({
url: '/base/equipment-check-order/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 根据设备获得所有巡检配置列表
export function getcheckConfigByEqList(query) {
return request({
url: '/base/equipment-check-config/list',
method: 'get',
params: query
})
}
// 删除设备巡检记录
export function deleteEqCheckLog(id) {
return request({
url: '/base/equipment-check-log/delete?id=' + id,
method: 'delete'
})
}
// 获得设备巡检单详情分页
export function getCheckOrderDetPage(query) {
return request({
url: '/base/equipment-check-order-det/page',
method: 'get',
params: query
})
}
// 创建设备巡检单详情
export function createCheckOrderDet(data) {
return request({
url: '/base/equipment-check-order-det/create',
method: 'post',
data: data
})
}
// 更新设备巡检单详情
export function updateCheckOrderDet(data) {
return request({
url: '/base/equipment-check-order-det/update',
method: 'put',
data: data
})
}
// 删除设备巡检单详情
export function deleteCheckOrderDet(id) {
return request({
url: '/base/equipment-check-order-det/delete?id=' + id,
method: 'delete'
})
}
// 获得设备巡检计划单
export function getEqCheckOrder(id) {
return request({
url: '/base/equipment-check-order/get?id=' + id,
method: 'get'
})
}
// 获得设备巡检单分页
export function getCheckOrderPage(query) {
return request({
url: '/base/equipment-check-order/page',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,162 @@
/*
* @Author: Do not edit
* @Date: 2023-11-08 15:56:52
* @LastEditTime: 2024-02-25 22:23:54
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 获得设备巡检设置
export function getEqCheck(id) {
return request({
url: '/base/equipment-check-config/get?id=' + id,
method: 'get'
})
}
// 创建巡检项目
export function createCheckDet(data) {
return request({
url: '/base/equipment-check-config-det/create',
method: 'post',
data: data
})
}
// 更新巡检项目
export function updateCheckDet(data) {
return request({
url: '/base/equipment-check-config-det/update',
method: 'put',
data: data
})
}
// 删除巡检项目
export function deleteCheckDet(id) {
return request({
url: '/base/equipment-check-config-det/delete?id=' + id,
method: 'delete'
})
}
//巡检项目
export function getCheckDet(id) {
return request({
url: '/base/equipment-check-config-det/get?id=' + id,
method: 'get'
})
}
// 获得巡检项目分页
export function getCheckDetPage(query) {
return request({
url: '/base/equipment-check-config-det/page',
method: 'get',
params: query
})
}
// 获得设备巡检所有列表
export function getcheckList(query) {
return request({
url: '/base/equipment-check/listAll',
method: 'get',
params: query
})
}
// 删除巡检内容
export function deleteCheck(id) {
return request({
url: '/base/equipment-check/delete?id=' + id,
method: 'delete'
})
}
// 获得设备巡检设置code
export function getCode() {
return request({
url: '/base/equipment-check-config/getCode',
method: 'get'
})
}
// 创建巡检配置
export function createCheckConfig(data) {
return request({
url: '/base/equipment-check-config/create',
method: 'post',
data: data
})
}
// 更新巡检配置
export function updateCheckConfig(data) {
return request({
url: '/base/equipment-check-config/update',
method: 'put',
data: data
})
}
// 创建巡检单
export function createCheckOrder(data) {
return request({
url: '/base/equipment-check-order/create',
method: 'post',
data: data
})
}
// 更新巡检单
export function updateCheckOrder(data) {
return request({
url: '/base/equipment-check-order/update',
method: 'put',
data: data
})
}
// 获得设备巡检单code
export function getOrderCode() {
return request({
url: '/base/equipment-check-order/getCode',
method: 'get'
})
}
// 获得巡检单
export function getCheckOrder(id) {
return request({
url: '/base/equipment-check-order/get?id=' + id,
method: 'get'
})
}
// 获得巡检单详细
export function getCheckOrderDet(id) {
return request({
url: '/base/equipment-check-order-det/get?id=' + id,
method: 'get'
})
}
// 创建巡检单详情
export function createCheckOrderDet(data) {
return request({
url: '/base/equipment-check-order-det/create',
method: 'post',
data: data
})
}
// 更新巡检单详情
export function updateCheckOrderDet(data) {
return request({
url: '/base/equipment-check-order-det/update',
method: 'put',
data: data
})
}

View File

@@ -0,0 +1,26 @@
/*
* @Author: Do not edit
* @Date: 2024-02-26 15:01:48
* @LastEditTime: 2024-02-26 18:09:39
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 获得设备保养记录分页
export function getLogDetPage(query) {
return request({
url: '/base/equipment-maintain-log-det/page',
method: 'get',
params: query
})
}
// 获得设备巡检单
export function getCheckOrder(query) {
return request({
url: '/base/equipment-check-order/get',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,104 @@
/*
* @Author: Do not edit
* @Date: 2024-02-22 15:14:19
* @LastEditTime: 2024-02-23 19:18:22
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 获得设备保养计划配置分页
export function getPlanPage(query) {
return request({
url: '/base/equipment-maintain-plan/page',
method: 'get',
params: query
})
}
// 创建设备保养计划
export function createPlan(data) {
return request({
url: '/base/equipment-maintain-plan/create',
method: 'post',
data: data
})
}
// 更新设备保养计划
export function updatePlan(data) {
return request({
url: '/base/equipment-maintain-plan/update',
method: 'put',
data: data
})
}
// 获得计划code
export function getCode() {
return request({
url: '/base/equipment-maintain-plan/getCode',
method: 'get'
})
}
// 获得计划
export function getPlan(query) {
return request({
url: '/base/equipment-maintain-plan/get',
method: 'get',
params: query
})
}
// 获得设备保养计划配置详情分页
export function getPlanDetPage(query) {
return request({
url: '/base/equipment-maintain-plan-det/page',
method: 'get',
params: query
})
}
// 创建设备保养计划详情
export function createPlanDet(data) {
return request({
url: '/base/equipment-maintain-plan-det/create',
method: 'post',
data: data
})
}
// 更新设备保养计划详情
export function updatePlanDet(data) {
return request({
url: '/base/equipment-maintain-plan-det/update',
method: 'put',
data: data
})
}
// 获得计划详情
export function getPlanDet(query) {
return request({
url: '/base/equipment-maintain-plan-det/get',
method: 'get',
params: query
})
}
// 删除设备保养计划
export function deletePlan(id) {
return request({
url: '/base/equipment-maintain-plan/delete?id=' + id,
method: 'delete'
})
}
// 删除设备保养计划详情
export function deletePlanDet(id) {
return request({
url: '/base/equipment-maintain-plan-det/delete?id=' + id,
method: 'delete'
})
}

View File

@@ -0,0 +1,80 @@
/*
* @Author: Do not edit
* @Date: 2023-11-08 15:56:52
* @LastEditTime: 2024-02-26 17:02:53
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 删除设备保养记录
export function deleteEqMaintainLog(id) {
return request({
url: '/base/equipment-maintain-log/delete?id=' + id,
method: 'delete'
})
}
// 删除设备保养计划配置
export function deleteEqMaintainPlan(id) {
return request({
url: '/base/equipment-maintain-plan/delete?id=' + id,
method: 'delete'
})
}
// 导出设备保养监控
export function exportMaintainMonitorExcel(query) {
return request({
url: '/base/equipment-maintain-plan/monitor-export',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出设备保养记录
export function exportMaintainLogExcel(query) {
return request({
url: '/base/equipment-maintain-log/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 导出巡检单
export function exportCheckOrderExcel(query) {
return request({
url: '/base/equipment-check-order/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}
// 获得保养记录
export function getLog(query) {
return request({
url: '/base/equipment-maintain-log/get',
method: 'get',
params: query
})
}
// 获得设备保养记录详情分页
export function getLogDetPage(query) {
return request({
url: '/base/equipment-maintain-log-det/page',
method: 'get',
params: query
})
}
// 删除设备保养记录详情
export function deleteLogDet(id) {
return request({
url: '/base/equipment-maintain-log-det/delete?id=' + id,
method: 'delete'
})
}

View File

@@ -0,0 +1,43 @@
/*
* @Author: Do not edit
* @Date: 2023-11-10 16:09:33
* @LastEditTime: 2023-11-23 20:29:28
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
//获得设备维修
export function getEqRepair(id) {
return request({
url: '/base/equipment-repair-log/get?id=' + id,
method: 'get'
})
}
// 更新设备维修记录
export function updateEqRepair(data) {
return request({
url: '/base/equipment-repair-log/update',
method: 'put',
data: data
})
}
// 删除维修记录
export function deleteRepair(id) {
return request({
url: '/base/equipment-repair-log/delete?id=' + id,
method: 'delete'
})
}
// 导出设备维修
export function exportRepairLogExcel(query) {
return request({
url: '/base/equipment-repair-log/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,68 @@
/*
* @Author: Do not edit
* @Date: 2023-11-11 16:18:57
* @LastEditTime: 2023-11-16 20:52:06
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
//获得备品备件配置
export function getSparePartConfig(id) {
return request({
url: '/base/equipment-spare-part-config/get?id=' + id,
method: 'get'
})
}
// 创建设备备品备件配置--抽屉
export function createConfigDet(data) {
return request({
url: '/base/equipment-spare-part-config-det/create',
method: 'post',
data: data
})
}
// 删除设备备品备件配置--抽屉
export function deleteConfigDet(id) {
return request({
url: '/base/equipment-spare-part-config-det/delete?id=' + id,
method: 'delete'
})
}
// 获得抽屉表格分页
export function getConfigDetPage(query) {
return request({
url: '/base/equipment-spare-part-config-det/page',
method: 'get',
params: query
})
}
// 获得备品备件列表
export function getSparePartList(query) {
return request({
url: '/base/equipment-spare-part/list',
method: 'get',
params: query
})
}
// 删除设备备品备件配置
export function deleteConfig(id) {
return request({
url: '/base/equipment-spare-part-config/delete?id=' + id,
method: 'delete'
})
}
// 获得备品备件分页
export function getSparePartPage(query) {
return request({
url: '/base/equipment-spare-part/page',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,16 @@
/*
* @Author: Do not edit
* @Date: 2023-11-22 13:59:17
* @LastEditTime: 2023-11-22 13:59:45
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 删除设备备品备件
export function deleteSparePart(id) {
return request({
url: '/base/equipment-spare-part/delete?id=' + id,
method: 'delete'
})
}

View File

@@ -0,0 +1,45 @@
/*
* @Author: Do not edit
* @Date: 2023-11-11 16:18:57
* @LastEditTime: 2023-11-11 18:44:51
* @LastEditors: DY
* @Description:
*/
import request from '@/utils/request'
// 获得抽屉表格分页
export function getConfigDetMonitorPage(query) {
return request({
url: '/base/equipment-spare-part-config-det/monitor',
method: 'get',
params: query
})
}
// 创建设备备品备件更换log
export function createSparePartLog(data) {
return request({
url: '/base/equipment-spare-part-log/create',
method: 'post',
data: data
})
}
// 获得设备备品备件更换log分页
export function getSparePartLogPage(query) {
return request({
url: '/base/equipment-spare-part-log/page',
method: 'get',
params: query
})
}
// 导出设备备品备件更换log
export function exportSparePartLogExcel(query) {
return request({
url: '/base/equipment-spare-part-log/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

View File

@@ -0,0 +1,121 @@
/*
* @Author: zhp
* @Date: 2023-11-07 19:47:48
* @LastEditTime: 2023-11-23 13:57:41
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 获得能耗统计查询分页
export function processEquMaterialBomPage(data) {
return request({
url: '/extend/process-equ-material-bom/page',
method: 'get',
params: data
})
}
export function updateProcessEquMaterialBom(data) {
return request({
url: '/extend/process-equ-material-bom/update',
method: 'put',
data: data
})
}
export function createProcessEquMaterialBom(data) {
return request({
url: '/extend/process-equ-material-bom/create',
method: 'post',
data: data
})
}
export function getProcessEquMaterialBom(data) {
return request({
url: '/extend/process-equ-material-bom/get',
method: 'get',
params: data
})
}
export function deleteProcessEquMaterialBom(id) {
return request({
url: '/extend/process-equ-material-bom/delete?id=' + id,
method: 'delete',
// data: data
})
}
export function getEquipmentList(data) {
return request({
url: '/base/core-equipment/listAll',
method: 'get',
data: data
})
}
export function deleteProcessEquMaterialBomDet(id) {
return request({
url: '/extend/process-equ-material-bom-det/delete?id=' + id,
method: 'delete',
// data: data
})
}
export function processEquMaterialBomDetPage(data) {
return request({
url: '/extend/process-equ-material-bom-det/page',
method: 'get',
params: data
})
}
export function updateProcessEquMaterialBomDet(data) {
return request({
url: '/extend/process-equ-material-bom-det/update',
method: 'put',
data: data
})
}
export function createProcessEquMaterialBomDet(data) {
return request({
url: '/extend/process-equ-material-bom-det/create',
method: 'post',
data: data
})
}
export function getProcessEquMaterialBomDet(data) {
return request({
url: '/extend/process-equ-material-bom-det/get',
method: 'get',
params: data
})
}
export function getMaterialList(data) {
return request({
url: '/base/material/listbyfilter',
method: 'get',
data: data
})
}
export function getMaterialCode(data) {
return request({
url: '/extend/process-equ-material-bom/getCode',
method: 'get',
params: data
})
}
export function createProcessEquMaterialBomDetList(data) {
return request({
url: '/extend/process-equ-material-bom-det/createByList',
method: 'post',
data: data
})
}

View File

@@ -0,0 +1,122 @@
/*
* @Author: zhp
* @Date: 2023-11-09 09:37:14
* @LastEditTime: 2023-11-23 14:15:45
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
export function processEquValueBomPage(data) {
return request({
url: '/extend/process-equ-value-bom/page',
method: 'get',
params: data
})
}
export function updateProcessEquValueBom(data) {
return request({
url: '/extend/process-equ-value-bom/update',
method: 'put',
data: data
})
}
export function createProcessEquValueBom(data) {
return request({
url: '/extend/process-equ-value-bom/create',
method: 'post',
data: data
})
}
export function getProcessEquValueBom(data) {
return request({
url: '/extend/process-equ-value-bom/get',
method: 'get',
params: data
})
}
export function deleteProcessEquValueBom(id) {
return request({
url: '/extend/process-equ-value-bom/delete?id=' + id,
method: 'delete',
// data: data
})
}
export function getEquipmentList(data) {
return request({
url: '/base/core-equipment/listAll',
method: 'get',
data: data
})
}
export function deleteProcessEquValueBomDet(id) {
return request({
url: '/extend/process-equ-value-bom-det/delete?id=' + id,
method: 'delete',
// data: data
})
}
export function processEquValueBomDetPage(data) {
return request({
url: '/extend/process-equ-value-bom-det/page',
method: 'get',
params: data
})
}
export function updateProcessEquValueBomDet(data) {
return request({
url: '/extend/process-equ-value-bom-det/update',
method: 'put',
data: data
})
}
export function createProcessEquValueBomDet(data) {
return request({
url: '/extend/process-equ-value-bom-det/create',
method: 'post',
data: data
})
}
export function getProcessEquValueBomDet(data) {
return request({
url: '/extend/process-equ-value-bom-det/get',
method: 'get',
params: data
})
}
export function getValueList(data) {
return request({
url: '/extend/process-equ-value-bom-det/getEnableValuesByEquId',
method: 'get',
params: data
})
}
export function getValueCode(data) {
return request({
url: '/extend/process-equ-value-bom/getCode',
method: 'get',
params: data
})
}
export function createProcessEquValueBomDetList(data) {
return request({
url: '/extend/process-equ-value-bom-det/createByList',
method: 'post',
data: data
})
}

View File

@@ -1,75 +0,0 @@
import request from '@/utils/request'
// 删除排班计划配置基础信息
export function deleteGroupPlan(id) {
return request({
url: '/base/group-scheduling-plan/delete?id=' + id,
method: 'delete'
})
}
// 获得排班计划配置基础信息分页
export function getGroupPlanPage(query) {
return request({
url: '/base/group-scheduling-plan/page',
method: 'get',
params: query
})
}
// 获取code
export function getCode() {
return request({
url: '/base/group-scheduling-plan/getCode',
method: 'get'
})
}
// 获得产线工段树形结构
export function getGroupPlanTree() {
return request({
url: '/base/factory/getTreeSimple',
method: 'get'
})
}
// 基础信息下一步至班组班次
export function createStepOne(data) {
return request({
url: '/base/group-scheduling-plan/createStepOne',
method: 'post',
data:data
})
}
// 班组班次上一步至基础信息
export function returnStepOne(id) {
return request({
url: '/base/group-scheduling-plan/returnStepOne?id='+id,
method: 'delete',
})
}
// 获取部门下可用班组
export function listByDeptId(id) {
return request({
url: '/base/group-team/listByDeptId?id='+id,
method: 'get'
})
}
// 班组班次下一步至获取预览
export function createStepTwo(data) {
return request({
url: '/base/group-scheduling-plan/createStepTwo',
method: 'post',
data:data
})
}
// 获取预览上一步至班组班次
export function returnStepTwo(id) {
return request({
url: '/base/group-scheduling-plan/returnStepTwo?id='+id,
method: 'delete',
})
}

View File

@@ -1,47 +0,0 @@
import request from '@/utils/request'
// 创建班组基础信息
export function createGroup(data) {
return request({
url: '/base/group-team/create',
method: 'post',
data: data
})
}
// 更新班组基础信息
export function updateGroup(data) {
return request({
url: '/base/group-team/update',
method: 'put',
data: data
})
}
// 获得班组基础信息
export function getGroup(id) {
return request({
url: '/base/group-team/get?id=' + id,
method: 'get'
})
}
// 获得班组基础信息分页
export function getGroupPage(query) {
return request({
url: '/base/group-team/page',
method: 'get',
params: query
})
}
// 获取班组code
export function getCode() {
return request({
url: '/base/group-team/getCode',
method: 'get'
})
}

View File

@@ -1,51 +0,0 @@
/*
* @Author: zwq
* @Date: 2025-10-18 21:24:37
* @LastEditors: zwq
* @LastEditTime: 2025-10-18 23:07:37
* @Description:
*/
import request from '@/utils/request'
// 获得节假日基础信息分页
export function deptHolidayList(query) {
return request({
url: '/base/group-holiday/page',
method: 'get',
params: query
})
}
// 创建节假日基础信息
export function createHoliday(data) {
return request({
url: '/base/group-holiday/create',
method: 'post',
data: data
})
}
// 更新节假日基础信息
export function updateHoliday(data) {
return request({
url: '/base/group-holiday/update',
method: 'put',
data: data
})
}
// 删除
export function deleteHolidayn(id) {
return request({
url: '/base/group-holiday/delete?id=' + id,
method: 'delete'
})
}
// 获得节假日变动日志分页
export function deptHolidayLogList(query) {
return request({
url: '/base/group-holiday-log/page',
method: 'get',
params: query
})
}

View File

@@ -43,14 +43,6 @@ export function getEnergyOverlimitLogPage(data) {
})
}
// 获得手动抄表记录分页
export function getEnergyManualLogPage(data) {
return request({
url: '/monitoring/energy-overlimit-log/pageManual',
method: 'post',
data: data
})
}
// 导出能源超限记录 Excel
export function exportEnergyOverlimitLogExcel(query) {
return request({

View File

@@ -0,0 +1,27 @@
import request from '@/utils/request'
// 执行班组追溯 根据工单
export function getByWorkOrder(query) {
return request({
url: '/monitoring/schedulingmonitoring/getByWorkOrder',
method: 'get',
params: query
})
}
// 执行班组追溯详情 根据工单班组
export function getByTeam(query) {
return request({
url: '/monitoring/schedulingmonitoring/getByTeam',
method: 'get',
params: query
})
}
// 获取某次排班的生产情况详情
export function getByScheduling(query) {
return request({
url: '/monitoring/schedulingmonitoring/getByScheduling',
method: 'get',
params: query
})
}

View File

@@ -0,0 +1,19 @@
import request from '@/utils/request'
// 获取工单信息
export function getWorkOrderMsg(data) {
return request({
url: '/monitoring/energy-work-order/getWorkOrderMsg',
method: 'post',
data: data
})
}
// 获取工单能源消耗数据
export function getOrderEnergyData(data) {
return request({
url: '/monitoring/energy-work-order/getData',
method: 'post',
data: data
})
}

View File

@@ -1,9 +1,16 @@
/*
* @Author: zhp
* @Date: 2023-10-17 09:26:38
* @LastEditTime: 2023-11-02 17:00:17
* @LastEditors: zhp
* @Description:
*/
import request from '@/utils/request'
// 创建质量检查信息记录表
export function createQualityInspectionRecord(data) {
return request({
url: '/monitoring/quality-inspection-record/create',
url: '/base/quality-inspection-record/create',
method: 'post',
data: data
})
@@ -12,7 +19,7 @@ export function createQualityInspectionRecord(data) {
// 更新质量检查信息记录表
export function updateQualityInspectionRecord(data) {
return request({
url: '/monitoring/quality-inspection-record/update',
url: '/base/quality-inspection-record/update',
method: 'put',
data: data
})
@@ -21,7 +28,7 @@ export function updateQualityInspectionRecord(data) {
// 删除质量检查信息记录表
export function deleteQualityInspectionRecord(id) {
return request({
url: '/monitoring/quality-inspection-record/delete?id=' + id,
url: '/base/quality-inspection-record/delete?id=' + id,
method: 'delete'
})
}
@@ -29,7 +36,7 @@ export function deleteQualityInspectionRecord(id) {
// 获得质量检查信息记录表
export function getQualityInspectionRecord(id) {
return request({
url: '/monitoring/quality-inspection-record/get?id=' + id,
url: '/base/quality-inspection-record/get?id=' + id,
method: 'get'
})
}
@@ -37,7 +44,7 @@ export function getQualityInspectionRecord(id) {
// 获得质量检查信息记录表分页
export function getQualityInspectionRecordPage(query) {
return request({
url: '/monitoring/quality-inspection-record/page',
url: '/base/quality-inspection-record/page',
method: 'get',
params: query
})
@@ -46,7 +53,7 @@ export function getQualityInspectionRecordPage(query) {
// 导出质量检查信息记录表 Excel
export function exportQualityInspectionRecordExcel(query) {
return request({
url: '/monitoring/quality-inspection-record/export-excel',
url: '/base/quality-inspection-record/export-excel',
method: 'get',
params: query,
responseType: 'blob'

Some files were not shown because too many files have changed in this diff Show More