Commit Graph

971 Commits

Author SHA1 Message Date
lb
db7d4745dd Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-29 16:55:52 +08:00
lb
6b99175574 update again 2024-03-29 16:30:37 +08:00
helloDy
34aeb029b5 Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-29 14:38:26 +08:00
helloDy
caf614ca35 操作 2024-03-29 14:14:21 +08:00
‘937886381’
c8913f192c Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-29 09:51:47 +08:00
‘937886381’
0fa651fccf 修改bug 2024-03-29 09:51:19 +08:00
gtz
33782e189c add_infra_job_log_route 2024-03-28 18:57:44 +08:00
gtz
ee828ec4a7 're_infra' 2024-03-28 18:40:27 +08:00
gtz
e75d2f1810 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2024-03-28 18:04:33 +08:00
gtz
ff9ee438ae 1 2024-03-28 18:04:26 +08:00
cea7fb622f Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-28 17:10:31 +08:00
6924566ab0 样式 2024-03-28 17:04:38 +08:00
‘937886381’
0d118d499f Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-28 16:49:16 +08:00
‘937886381’
f00a972f32 修改ui 2024-03-28 16:48:42 +08:00
‘937886381’
04cea7a199 修改ui 2024-03-28 15:36:39 +08:00
lb
fa746ab9b0 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-28 15:12:56 +08:00
lb
08d2d7f5d3 update 权限 2024-03-28 14:16:27 +08:00
lb
e4948eb340 delete activated() 2024-03-28 09:06:09 +08:00
f80f648771 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-28 08:13:38 +08:00
5d16c37965 keep-alive缓存 2024-03-28 08:09:49 +08:00
‘937886381’
b8c39e8095 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-27 17:03:09 +08:00
‘937886381’
53526b5f78 修改bug 2024-03-27 17:02:44 +08:00
lb
65f42828b8 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-27 16:53:45 +08:00
lb
312ed7ecb7 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-27 16:47:08 +08:00
lb
b367bfcbe4 bugfix zentao 2024-03-27 16:46:06 +08:00
lb
1c301215d1 purge 2024-03-27 16:34:55 +08:00
lb
e0fac4556d update tableheight 2024-03-27 16:28:09 +08:00
‘937886381’
f025a2b77b Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-27 12:02:30 +08:00
‘937886381’
c361a8c519 修改bug 2024-03-27 12:01:25 +08:00
24a38689d4 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-27 09:45:56 +08:00
6ce3faf98d 1 2024-03-27 09:43:26 +08:00
‘937886381’
028cd07e1a Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-27 09:30:38 +08:00
‘937886381’
0aa509e430 修改bug 2024-03-27 09:30:16 +08:00
lb
688c541074 merge 2024-03-27 09:14:28 +08:00
‘937886381’
8a7e124e46 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-26 18:01:14 +08:00
‘937886381’
88272e512e 修改bug 2024-03-26 18:00:49 +08:00
lb
7c242034e2 keep deleting & test docker, nginx & local deployment 2024-03-26 17:45:29 +08:00
98fc1953cf Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-26 17:18:39 +08:00
1c0dba7dbb ws心跳检查 2024-03-26 17:16:52 +08:00
helloDy
df2df6ed7a Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-26 16:52:28 +08:00
helloDy
a409a22bef time 2024-03-26 16:52:04 +08:00
‘937886381’
328ed8ae63 修改bug 2024-03-26 16:45:16 +08:00
‘937886381’
2f3376a2d5 修改bug 2024-03-26 12:33:47 +08:00
‘937886381’
f2b5598e14 修改bug 2024-03-26 10:47:46 +08:00
‘937886381’
774d51fdcf Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-26 09:43:18 +08:00
‘937886381’
7b0f03b76f 修改bug 2024-03-26 09:42:51 +08:00
zwq
5d2d510e23 修改成本表格 2024-03-26 09:04:17 +08:00
f844834453 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-26 08:19:15 +08:00
‘937886381’
a750e565e2 修改bug 2024-03-25 18:42:00 +08:00
d92d9fd594 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-25 17:19:45 +08:00
‘937886381’
3823c3cb3e 修改bug 2024-03-25 16:57:41 +08:00
lb
abfd448247 删除+优化特殊设备 2024-03-25 14:37:03 +08:00
lb
2d6701ce54 update 2024-03-25 09:08:00 +08:00
lb
afa3f7c6f5 update 巡检提示 2024-03-22 17:16:30 +08:00
‘937886381’
649be9a18b 修改bug 2024-03-22 17:14:34 +08:00
‘937886381’
95abfcf158 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-22 16:45:56 +08:00
‘937886381’
ba2aa7b1b8 修改bug 2024-03-22 16:45:17 +08:00
zwq
35bd7ab57e 更新成本bug 2024-03-22 16:23:08 +08:00
21f7542695 删除一些多余的文件夹 2024-03-22 16:04:51 +08:00
‘937886381’
974ebc53df 解决冲突 2024-03-22 14:18:47 +08:00
‘937886381’
f8829ec3b7 修改bug 2024-03-22 14:17:57 +08:00
helloDy
b303dbda0c pie 2024-03-22 14:12:52 +08:00
helloDy
f1fd854567 merge 2024-03-22 10:29:41 +08:00
helloDy
99fd016703 bug 3 2024-03-22 10:27:57 +08:00
‘937886381’
ab6ea3f404 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-22 10:20:40 +08:00
‘937886381’
60b3695a37 修改bug 2024-03-22 10:20:08 +08:00
zwq
7597047220 更新成本bug 2024-03-22 10:17:03 +08:00
lb
dc94bfd51f 1 2024-03-22 10:10:57 +08:00
lb
e45c14de30 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-22 10:01:53 +08:00
lb
14afb6d4b1 update 设备状态时序图设备名长度 2024-03-22 10:01:14 +08:00
‘937886381’
96de42dc6a Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-21 16:35:02 +08:00
‘937886381’
f7aa5375d0 修改bug 2024-03-21 16:34:34 +08:00
zwq
d70887fef0 修改成本bug 2024-03-21 13:43:09 +08:00
lb
4801287c01 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-21 13:35:43 +08:00
lb
57071bc24a bugfix zentao 2024-03-21 10:45:06 +08:00
300a33dca4 Merge branch 'projects/mesxc-test' into projects/mesxc-zjl 2024-03-21 08:28:26 +08:00
6f937e1976 改bug 2024-03-21 08:27:35 +08:00
‘937886381’
aa582495de Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-20 15:55:25 +08:00
‘937886381’
6adbdac0a4 修改bug 2024-03-20 15:54:57 +08:00
helloDy
e211e585af Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-20 08:48:34 +08:00
helloDy
630e7a95b3 bug 2 2024-03-20 08:48:02 +08:00
8fcf6516a3 能源bug 2024-03-19 14:08:34 +08:00
‘937886381’
a0a9107863 Merge branch 'projects/mesxc-test' into projects/mesxc-zhp 2024-03-18 16:01:32 +08:00
‘937886381’
94886eedde 修改bug 2024-03-18 16:00:56 +08:00
0c5245ef9b 订单详情修改字段 2024-03-18 08:27:05 +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
‘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
73928a0ed0 厂务订单里改个工单接口 2024-03-15 13:33:58 +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
lb
e3133cef1f Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-14 17:08:39 +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
526bb8c534 班组bug 2024-03-14 14:47:57 +08:00
lb
7b4cd85ba0 1 2024-03-14 14:36:52 +08:00
lb
764030a8da Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-14 09:01:45 +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’
224625e10f 修改bug 2024-03-13 15:30:08 +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
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
‘937886381’
0457514f1e 修改bug 2024-03-12 11:18:06 +08:00
‘937886381’
bddb182b73 修改bug 2024-03-11 17:06:38 +08:00
‘937886381’
df75aa04a1 修改bug 2024-03-11 15:47:46 +08:00
‘937886381’
2e214b52a6 修改bug 2024-03-08 16:20:03 +08:00
‘937886381’
39493549b9 修改bug 2024-03-07 16:28:23 +08:00
‘937886381’
e6e280c930 修改bug 2024-03-06 11:01:31 +08:00
‘937886381’
a80ce13de1 解决冲突 2024-03-05 09:49:01 +08:00
‘937886381’
a027c4ca63 修改bug 2024-03-05 09:48:16 +08:00
9a6aa75171 merge test 2024-03-04 14:09:07 +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
helloDy
063532567b Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-03-04 12:04:50 +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
helloDy
e509722ac4 env 2024-03-01 20:41:09 +08:00
helloDy
48e7612a78 bug second 2024-03-01 20:39:52 +08:00
‘937886381’
f685a65a1f 解决冲突 2024-03-01 15:28:12 +08:00
‘937886381’
d8c126fccf 修改bug 2024-03-01 15:27:01 +08:00
lb
f378347063 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-01 11:20:00 +08:00
151df54032 3,1 2024-03-01 11:17:11 +08:00
lb
4c41d6fad9 bugfix 2024-03-01 11:16:53 +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
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
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
d750cbe0f8 订单状态对于按钮操作确认修改 2024-02-29 09:20:34 +08:00
4174feab9e merge test 2024-02-28 17:03:06 +08:00
ce1971727a 集团订单 2024-02-28 16:56:47 +08:00
helloDy
ecb447c052 巡检 2024-02-28 16:14:41 +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
‘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
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
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
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
helloDy
85791cc10c Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2024-02-27 09:23:00 +08:00
helloDy
ef740fec27 设备保养设备巡检 2024-02-27 09:22:03 +08:00
a8013fce87 merge test 2024-02-27 09:14:10 +08:00
65e2f9ed6a 订单bug修改 2024-02-27 09:12:17 +08:00
lb
6d3b41a394 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-26 17:06:19 +08:00
3e89f4066f 订单bug 2024-02-26 13:18:21 +08:00
c5925e54cd merge test 2024-02-26 10:45:48 +08:00
lb
512986faf6 fix navbar right 2024-02-26 10:28:16 +08:00
b08639f15c merge test 2024-02-26 10:19:35 +08:00
9a807ff798 能源bug修改 2024-02-26 10:15:56 +08:00
helloDy
7da93bbca0 merge 2024-02-26 08:46:18 +08:00
helloDy
0abf628377 设备 2024-02-26 08:44:42 +08:00
helloDy
35da704bb4 设备保养 2024-02-24 19:18:11 +08:00
lb
2997f4b7b9 Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-02-23 17:15:56 +08:00
lb
4316e7f37f merge & delete yarn.lock 2024-02-23 17:14:28 +08:00
842b863561 merge test 2024-02-23 17:11:24 +08:00
lb
89e86c31bb update 巡检记录 2024-02-23 17:03:55 +08:00
71fc98b0bb 订单管理 2024-02-23 17:01:48 +08:00
lb
15738642b0 update 2024-02-23 16:32:01 +08:00
‘937886381’
81c1f2c571 xiugaibug 2024-02-23 16:12:43 +08:00
‘937886381’
a6f7bb2f2d 解决冲突 2024-02-23 16:04:05 +08:00
‘937886381’
05b513a862 修改 2024-02-23 16:02:55 +08:00
lb
f72cd9d68e update 待确认 2024-02-23 15:11:36 +08:00
lb
99b225e3dc update 巡检待确认 2024-02-23 11:20:04 +08:00
lb
4d1b72fae7 update 巡检待确认 2024-02-23 09:45:43 +08:00
lb
67a76869e1 update 巡检单待确认 2024-02-22 16:52:07 +08:00
lb
ca2774ca28 update navbar user dept 2024-02-22 16:23:19 +08:00
lb
1dd7fef171 update 巡检待确认 2024-02-22 16:19:02 +08:00
lb
9ad83f84fa update 巡检单设置 2024-02-22 16:11:30 +08:00
lb
ef354732b4 update 巡检单设置 2024-02-22 11:21:59 +08:00
helloDy
ff19047729 merge 2024-02-21 18:47:46 +08:00
helloDy
ea7c419c6f 基础核心,设备基础 2024-02-21 18:39:48 +08:00
lb
95a4b336f8 update 2024-02-21 16:55:35 +08:00
lb
ed65bd7f30 update check record 2024-02-21 16:39:43 +08:00
lb
5b40c3972c update repair detail 2024-02-21 15:51:59 +08:00
‘937886381’
d3b87e4051 解决冲突 2024-02-21 15:28:15 +08:00
‘937886381’
03ee5e1037 修改bug 2024-02-21 15:27:09 +08:00
lb
f8c2889abc update repair 2024-02-21 14:44:15 +08:00
lb
eb0445f479 update 特种设备维修 2024-02-20 17:00:56 +08:00
lb
9f8d604456 done 保养模块 2024-02-20 15:53:31 +08:00
lb
d5551eabb8 update 保养记录详情 2024-02-20 15:14:31 +08:00