Commit Graph

231 Commits

Author SHA1 Message Date
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
Fanzink
3eac46beeb '' 2022-02-28 10:06:17 +08:00
Fanzink
64c27487c5 '' 2022-02-25 15:12:37 +08:00
14bf2dc2f6 Merge pull request '修改接口api' (#16) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #16
2022-02-25 11:01:58 +08:00
zwq
de1a7835e1 修改接口api 2022-02-25 11:01:39 +08:00
e023b9c23e Merge pull request '更新' (#15) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #15
2022-02-25 10:58:17 +08:00
6e18a42c03 Merge branch 'develop' into zwq 2022-02-25 10:58:05 +08:00
zwq
7e6881ff74 更新 2022-02-25 10:57:07 +08:00
7c6d7b63e3 Merge pull request 'fix: 🐛 修正构建包安装顺序' (#14) from cicd into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #14
2022-02-23 13:23:22 +08:00
bb4f3e2c0e fix: 🐛 修正构建包安装顺序 2022-02-23 13:22:42 +08:00
c4e7af8fba Merge pull request 'fix: 🏗️ 修复raphael依赖找不到问题' (#13) from cicd into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #13
2022-02-23 12:47:16 +08:00
0338bf1a15 fix: 🏗️ 修复raphael依赖找不到问题 2022-02-23 12:46:46 +08:00
aa15b551fb Merge pull request 'fix: 🐛 修正构建脚本' (#12) from cicd into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #12
2022-02-23 11:42:46 +08:00