Commit Graph

51 Commits

Author SHA1 Message Date
37188fe760 Merge pull request '5.24' (#20) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2023-05-24 10:37:31 +08:00
f3e296f6e6 5.24 2023-05-24 10:37:01 +08:00
dead1e5a40 Merge pull request '5.22' (#19) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #19
2023-05-22 14:21:50 +08:00
997c8c86eb 5.22 2023-05-22 14:21:16 +08:00
9c6bf70008 Merge pull request '5.18' (#18) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #18
2023-05-18 11:14:36 +08:00
61d55ac797 5.18 2023-05-18 11:14:03 +08:00
194b2f0e0d Merge pull request '修bug' (#17) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #17
2023-05-16 16:14:28 +08:00
948cc07a9c 修bug 2023-05-16 16:13:35 +08:00
34d7b8682d Merge pull request '修改bug' (#16) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #16
2023-05-15 17:25:59 +08:00
7067aaa2df 修改bug 2023-05-15 17:25:05 +08:00
6f8f692852 Merge pull request 'zjl' (#15) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #15
2023-05-04 16:20:39 +08:00
da452fe43a dist 2023-05-04 16:20:00 +08:00
9613c361be 基板报表&厚度汇总报表 2023-05-04 16:15:57 +08:00
65beb245d6 4.26 2023-04-26 15:27:00 +08:00
c75999ea93 Merge pull request '报表模块小问题' (#14) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #14
2023-03-23 15:50:36 +08:00
ae530033e3 报表模块小问题 2023-03-23 15:50:11 +08:00
76b88ed75a Merge pull request '报表模块' (#13) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #13
2023-03-23 15:40:58 +08:00
8060214000 报表模块 2023-03-23 15:40:15 +08:00
a7b39f3ce1 Merge pull request 'fix: 🐛 修正构建脚本' (#12) from cicd into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #12
2023-03-14 14:39:39 +08:00
8dc73bd098 fix: 🐛 修正构建脚本 2023-03-14 14:38:01 +08:00
523a9d9767 Merge pull request 'zjl' (#11) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #11
2023-03-14 14:15:38 +08:00
b9428e6a89 颗粒折线图 2023-03-14 14:14:03 +08:00
d9da687efd 缺陷散点图 2023-03-10 16:55:32 +08:00
6aadadea13 过程全检 2023-03-09 17:01:02 +08:00
4aad193bb0 Merge pull request '工艺&设备' (#10) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #10
2023-02-23 16:56:56 +08:00
2f8b5eb8a1 工艺&设备 2023-02-23 16:56:28 +08:00
64f4251159 Merge pull request '上传dist文件' (#9) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #9
2023-02-22 13:59:57 +08:00
a8aca1b395 上传dist文件 2023-02-22 13:59:09 +08:00
8810012a03 Merge pull request 'zjl' (#8) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #8
2023-02-22 11:06:10 +08:00
09eee99dc9 2 2023-02-22 11:05:33 +08:00
be86fb6215 1 2023-02-22 10:54:04 +08:00
c74f27cbf3 Merge pull request '构建失败,修改package-lock.json' (#7) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #7
2023-02-22 09:24:37 +08:00
88545d4e3a 构建失败,修改package-lock.json 2023-02-22 09:22:47 +08:00
a9c6dfeb0b Merge pull request '修bug&更改散点图样式' (#6) from zjl into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #6
2023-02-21 16:36:44 +08:00
fcedda5076 修bug&更改散点图样式 2023-02-21 16:34:49 +08:00
d775dc7371 Merge pull request '修复bug' (#5) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #5
2023-02-14 15:35:34 +08:00
49604f23c2 修复bug 2023-02-14 15:35:09 +08:00
d3de840af1 Merge pull request '颗粒折线图' (#4) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #4
2023-02-14 11:03:07 +08:00
955074ca58 颗粒折线图 2023-02-14 11:02:37 +08:00
6237b3a8f3 Merge pull request 'zjl' (#3) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
2023-02-13 17:25:34 +08:00
16d7c0c4ad 2.13 2023-02-13 17:24:54 +08:00
9eeb740c2e 设备OEE 2023-02-10 17:14:06 +08:00
df8c022982 Merge pull request '基础报表管理样式' (#2) from zjl into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #2
2023-02-08 17:23:35 +08:00
9530d7e889 基础报表管理样式 2023-02-08 17:23:01 +08:00
781877fca5 Merge pull request 'feat: 👷 添加自动构建功能' (#1) from cicd4tftfe into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #1
2023-02-08 08:56:40 +08:00
be198b6046 feat: 👷 添加自动构建功能 2023-02-08 08:54:17 +08:00
a85c385180 tree样式和多tab页面跳转问题 2023-02-07 15:29:23 +08:00
af0c631800 tab路由页面刷新active的问题 2023-01-11 16:32:26 +08:00
703813eafd 替换组件 2023-01-11 14:23:09 +08:00
9e9d6dde22 1.4 2023-01-04 15:23:46 +08:00