|
|
5a3e16df1b
|
Merge pull request 'fzq' (#32) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #32
|
2023-09-12 15:37:15 +08:00 |
|
Fanzink
|
6815ac4cc4
|
'修改设备与PLC关联-新增-下拉框条数'
|
2023-09-12 12:44:54 +05:30 |
|
Fanzink
|
4ffbdaef8a
|
'设备与PLC，设备获取所有'
|
2023-04-22 10:51:10 +05:30 |
|
|
|
36e6551465
|
Merge pull request ''厂务设备参数修改设备列表size，设备分析状态监控去掉默认产线工厂'' (#29) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #29
|
2023-04-18 15:42:29 +08:00 |
|
Fanzink
|
b1ab1962b1
|
'厂务设备参数修改设备列表size，设备分析状态监控去掉默认产线工厂'
|
2023-04-18 09:48:13 +05:30 |
|
|
|
2cefabc24b
|
Merge pull request ''修改日期选择器样式文件index.css'' (#28) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #28
|
2023-03-30 15:40:27 +08:00 |
|
Fanzink
|
db47bffb18
|
'修改日期选择器样式文件index.css'
|
2023-03-30 11:28:14 +05:30 |
|
|
|
65b489d37c
|
Merge pull request ''数据分析bug修改2次'' (#27) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #27
|
2023-03-27 10:59:39 +08:00 |
|
Fanzink
|
5afadfb1ce
|
'数据分析bug修改2次'
|
2023-03-24 17:23:26 +05:30 |
|
|
|
67612107ea
|
Merge pull request ''改数据分析bug'' (#26) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #26
|
2023-03-23 17:09:52 +08:00 |
|
Fanzink
|
e0d4e5327f
|
'改数据分析bug'
|
2023-03-23 11:31:59 +05:30 |
|
|
|
7ec1c5f3fc
|
Merge pull request ''修改数据分析/产品质量分析和产量分析'' (#25) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #25
|
2023-03-21 14:20:58 +08:00 |
|
Fanzink
|
3da95fed21
|
'修改数据分析/产品质量分析和产量分析'
|
2023-03-18 13:58:14 +05:30 |
|
|
|
092d7da353
|
Merge pull request ''数据分析-产量分析，产品质量分析，设备产量时序图'' (#24) from fzq into develop
continuous-integration/drone/push Build is passing
Reviewed-on: #24
|
2023-03-14 18:09:35 +08:00 |
|
Fanzink
|
683fc9169a
|
'数据分析-产量分析，产品质量分析，设备产量时序图'
|
2023-03-14 15:24:30 +05:30 |
|
|
|
e81c4f6907
|
Merge pull request ''update'' (#23) from fzq into develop
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
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
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
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
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
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
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
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
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
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
continuous-integration/drone/push Build is passing
Reviewed-on: #9
|
2022-10-17 15:51:26 +08:00 |
|
