Commit Graph

216 Commits

Author SHA1 Message Date
e81c4f6907 Merge pull request ''update'' (#23) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #23
2023-02-14 12:00:34 +08:00
Fanzink
bc4cfdc990 'update' 2023-02-13 17:09:10 +08:00
1c67ef4c6a Merge pull request ''update'' (#22) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #22
2023-02-09 15:08:04 +08:00
Fanzink
0b5740d41c 'update' 2023-02-09 15:06:33 +08:00
bd8bdfd9a8 Merge pull request ''update''' (#21) from fzq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #21
2023-02-09 10:32:51 +08:00
Fanzink
41e680b55d 'update'' 2023-02-09 10:31:00 +08:00
fa06c12ece Merge pull request 'fzq' (#20) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2023-02-08 19:42:10 +08:00
Fanzink
28303e4c5f 'update' 2023-02-08 18:13:08 +08:00
Fanzink
bbe5e63075 'update' 2023-02-06 10:25:01 +08:00
e964c643d8 Merge pull request 'fzq' (#19) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #19
2023-02-03 16:52:39 +08:00
Fanzink
f9d40b3790 '改bug' 2023-02-03 16:44:47 +08:00
Fanzink
8ec42773cd 'update' 2023-01-31 10:48:38 +08:00
715bc73504 Merge pull request 'fzq' (#17) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #17
2023-01-17 16:25:39 +08:00
Fanzink
2f4e9f31cd 'update新图标、新样式' 2023-01-17 16:20:28 +08:00
Fanzink
5798e5b6e0 '前后端内容修改、样式、中英文' 2023-01-13 16:54:26 +08:00
63a487dcd2 Merge pull request ''修改路由点击BUG,字段显示,按钮盒,基础样式'' (#16) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #16
2023-01-06 15:52:37 +08:00
Fanzink
3265b4a580 '修改路由点击BUG,字段显示,按钮盒,基础样式' 2023-01-06 15:44:05 +08:00
ece96e5cab Merge pull request 'fzq' (#15) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #15
2022-12-29 13:56:05 +08:00
Fanzink
a08af6774e '更改baseTable和content样式' 2022-12-16 20:48:44 +08:00
Fanzink
3c38763cf4 Merge branch 'develop' into fzq 2022-12-13 21:01:35 +08:00
Fanzink
23b7b85b39 'update' 2022-12-13 21:00:49 +08:00
2f2eaf4e20 Merge pull request 'fzq' (#14) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #14
2022-12-12 16:28:34 +08:00
Fanzink
a5a4f93328 'update' 2022-12-11 20:56:46 +08:00
Fanzink
f7938f30e2 'update' 2022-12-11 20:36:21 +08:00
Fanzink
d23cb260a4 '更新navbar' 2022-12-11 20:32:10 +08:00
Fanzink
e5eb49a7b6 Merge branch 'develop' into fzq 2022-12-02 16:20:45 +08:00
Fanzink
35d5d91c23 '样式修改-登录/中英文' 2022-12-02 16:19:14 +08:00
f3a7e38d13 Merge pull request 'lb' (#10) from lb into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #10
2022-11-25 11:06:50 +08:00
5d36eb676c update 小修改“ 2022-11-10 15:12:23 +08:00
14b933fb0c update 安灯检测盒 2022-11-02 13:34:11 +08:00
92f52ab553 update productLine 2022-10-28 14:50:09 +08:00
15210c2f12 update 2022-10-18 14:42:48 +08:00
8447b8f7ab Merge branch 'lb' of http://git.picaiba.com/mt-fe-group/mt-yd-ui into lb 2022-10-17 16:59:11 +08:00
ca7fda73e3 update i18n 2022-10-17 16:52:07 +08:00
1617bc347a Merge pull request 'update 数据分析' (#9) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #9
2022-10-17 15:51:26 +08:00
lb
762861a922 update 数据分析 2022-10-14 14:03:00 +08:00
68c271618a Merge pull request 'lb' (#8) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #8
2022-10-09 16:58:40 +08:00
127347fab0 update 修改当前检测数据的图例配置 2022-10-09 16:57:02 +08:00
b9ac64ab13 update 2022-10-09 16:45:03 +08:00
089a6517d3 update 2022-10-09 13:16:55 +08:00
1047dd78ec update 2022-10-09 11:31:54 +08:00
5a08d8c1dd fix some bugs 2022-10-09 10:36:18 +08:00
d0f113513c fix' 设备信息编辑时提示'请输入正确的数值'的bug 2022-10-08 14:42:16 +08:00
ff11e1d3fb Merge pull request 'lb' (#7) from lb into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #7
2022-10-08 14:16:26 +08:00
b54298fe09 update 质量当前检测数据产线名字段 2022-10-08 09:57:01 +08:00
5b2de3fb27 update AddOrUpdateConfig文档 2022-10-08 09:45:00 +08:00
9c13434c48 update 设备信息 2022-10-08 08:55:17 +08:00
86d3f63178 update request.sj 2022-09-30 17:03:40 +08:00
3f43f0c979 update 设备信息新增编辑 2022-09-30 17:01:47 +08:00
ae8a3668c8 update 设备的工段绑定 2022-09-30 15:04:19 +08:00