Commit Graph

143 Commits

Author SHA1 Message Date
9f42c5e33e Merge pull request '更新工艺' (#40) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #40
2022-03-08 09:11:55 +08:00
zwq
a2adcc0fd3 更新工艺 2022-03-08 09:11:34 +08:00
0c0679cb1e Merge pull request '更新工艺' (#39) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #39
2022-03-08 09:02:19 +08:00
zwq
4743fdc191 更新工艺 2022-03-08 09:01:47 +08:00
cf888de5d8 Merge branch 'develop' into gtz 2022-03-07 20:42:39 +08:00
ba3983e085 update dashboard 2022-03-07 20:42:06 +08:00
c9d77e20a0 Merge pull request 'dashboard' (#38) from gtz into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #38
2022-03-07 19:49:47 +08:00
1ed431e10a update 2022-03-07 19:48:14 +08:00
cbcbe5ccfa Merge pull request '更新' (#37) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #37
2022-03-07 09:32:02 +08:00
zwq
a214eb9bad 更新 2022-03-07 09:31:40 +08:00
e3be286a50 Merge pull request '更新' (#36) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #36
2022-03-07 09:17:49 +08:00
zwq
f5a003876f 更新 2022-03-07 09:17:12 +08:00
de76ca416c Merge pull request 'fzq' (#35) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #35
2022-03-07 09:07:28 +08:00
Fanzink
95afd175a3 '' 2022-03-07 08:43:56 +08:00
Fanzink
9f1a4226c3 '' 2022-03-07 08:41:20 +08:00
Fanzink
90344983b3 Merge branch 'develop' into fzq 2022-03-06 19:36:56 +08:00
Fanzink
97997681a2 '工序库位+报表' 2022-03-06 19:36:26 +08:00
Fanzink
82f44b5a62 '基础+报表' 2022-03-05 19:43:42 +08:00
28316462aa Merge pull request 'fzq' (#32) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #32
2022-03-04 11:18:40 +08:00
Fanzink
b5081ba279 '不动vue.config.js' 2022-03-04 11:12:33 +08:00
Fanzink
913e03230e '' 2022-03-04 11:01:51 +08:00
Fanzink
81e92cdb3f '不动vue.config.js' 2022-03-04 10:59:43 +08:00
Fanzink
aec5bcaf85 '' 2022-03-04 10:58:39 +08:00
Fanzink
581ca3d60b '' 2022-03-04 10:48:30 +08:00
Fanzink
cb7718c340 '' 2022-03-04 10:47:28 +08:00
7501849be6 Merge pull request '更新' (#30) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #30
2022-03-04 10:45:43 +08:00
Fanzink
2a4fdeef04 '不动vue.config.js' 2022-03-04 10:45:12 +08:00
zwq
33a27dd810 更新 2022-03-04 10:44:28 +08:00
Fanzink
8801c44b98 Merge branch 'develop' into fzq 2022-03-03 20:49:39 +08:00
Fanzink
04cc50f504 '基础资料部分' 2022-03-03 20:48:59 +08:00
878c9b22f7 Merge pull request 'eslint版本' (#28) from dy into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #28
2022-03-03 16:59:38 +08:00
dengyan
037071350a eslint 2022-03-03 16:57:29 +08:00
dengyan
56f59f533d Merge branch 'develop' into dy 2022-03-03 16:51:40 +08:00
dengyan
d9559db959 设备稼动率 2022-03-03 16:51:09 +08:00
8966dec79a Merge pull request '修改菜单,增加质量管理' (#26) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #26
2022-03-03 16:15:37 +08:00
zwq
9513fb484b 修改菜单,增加质量管理 2022-03-03 16:15:01 +08:00
68193ecfb3 Merge pull request '更新' (#25) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #25
2022-03-02 11:04:49 +08:00
zwq
5a42c80256 更新 2022-03-02 11:03:56 +08:00
Fanzink
ffdcbf6fa7 修改vue.config.js 2022-02-28 15:53:44 +08:00
Fanzink
f655b4d718 '' 2022-02-28 15:48:39 +08:00
Fanzink
a0adee8ce5 '' 2022-02-28 15:45:50 +08:00
0cd8970053 Merge pull request '更新' (#24) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #24
2022-02-28 10:59:14 +08:00
zwq
597934be2e 更新 2022-02-28 10:58:51 +08:00
fcb01aaa4b Merge pull request '更新' (#23) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #23
2022-02-28 10:54:13 +08:00
zwq
93be36708d 更新 2022-02-28 10:53:52 +08:00
80439e7e01 Merge pull request 'zwq' (#22) from zwq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #22
2022-02-28 10:50:12 +08:00
zwq
6a338438bf 更新 2022-02-28 10:49:30 +08:00
zwq
e74632e5fa 更新 2022-02-28 10:45:03 +08:00
21d7a8f7eb Merge pull request 'fzq' (#20) from fzq into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #20
2022-02-28 10:33:30 +08:00
Fanzink
6d2311be44 '' 2022-02-28 10:09:59 +08:00