Commit Graph

4369 Commits

Author SHA1 Message Date
wyx
6390eb6e9f feat:项目-学员管理-学员查看-证书数量传递 2023-03-08 20:46:15 +08:00
wyx
eab1292e38 style 2023-03-08 19:05:58 +08:00
wyx
b662d41791 style 2023-03-08 18:47:29 +08:00
huangshengfa
c684115eba Merge branch 'pre-release' into 'release'
Pre release

See merge request !67
2023-03-08 17:44:55 +08:00
huangshengfa
9291626d80 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !66
2023-03-08 17:43:36 +08:00
wyx
7276fd58a0 Merge branch 'develop' into manage-release 2023-03-08 17:35:42 +08:00
wyx
fa81d6c16c fix:岗位显示修改 2023-03-08 17:35:21 +08:00
wyx
771bf35ccc Merge branch 'develop' into manage-release 2023-03-08 17:28:40 +08:00
wyx
390afad00d fix:域名修改 2023-03-08 17:28:26 +08:00
wyx
1b76de982a fix:修改版本号 2023-03-08 17:19:13 +08:00
wyx
d225f7482b Merge branch 'develop' into manage-release 2023-03-08 17:18:46 +08:00
yuping
b6019bfec6 -- fix 项目任务 管理查看权限 2023-03-08 17:17:54 +08:00
yuping
f75d12bf58 Merge remote-tracking branch 'origin/develop' into develop 2023-03-08 17:01:25 +08:00
yuping
61ce5ccac7 -- fix 项目任务 管理 2023-03-08 17:01:09 +08:00
wyx
9ab5683222 style 2023-03-08 16:57:50 +08:00
huangshengfa
19c5798ae5 Merge branch 'new-dev-n' into 'develop'
New dev n

See merge request !64
2023-03-08 16:28:23 +08:00
wyx
d952369464 fix:style 2023-03-08 16:21:14 +08:00
huangshengfa
83e84cb026 Merge branch 'dev_m' into 'develop'
fix: 菜单修改

See merge request !63
2023-03-08 15:44:46 +08:00
mx00085@163.com
0f22c8a458 fix: 菜单修改 2023-03-08 15:43:02 +08:00
wyx
a5e3842e89 style 2023-03-08 15:38:48 +08:00
wyx
ba6a5105bd style 2023-03-08 14:58:21 +08:00
wyx
989ad97b42 style 2023-03-08 14:27:06 +08:00
yuping
2efd479756 -- fix 2023-03-08 13:59:18 +08:00
yuping
bb53067fc8 Merge remote-tracking branch 'origin/develop' into develop 2023-03-08 12:43:57 +08:00
yuping
fc23e28da5 -- fix 2023-03-08 12:43:45 +08:00
wyx
bae62258e7 fix:点击新建评估跳转评估页面自动打开新建评估弹框 2023-03-08 12:36:33 +08:00
wyx
316add9911 fix:限制输入最大值设置 2023-03-08 11:38:13 +08:00
huangshengfa
3e3a25e2a7 Merge branch 'new-dev' into 'develop'
New dev

See merge request !62
2023-03-08 09:20:34 +08:00
huangshengfa
00a270841f Merge branch 'pre-release' into 'release'
Pre release

See merge request !61
2023-03-08 09:20:05 +08:00
wyx
7e710aa148 Merge branch 'develop' into manage-release 2023-03-08 08:42:13 +08:00
wyx
bd32f48399 fix:评估图片显示 2023-03-08 08:41:44 +08:00
yuping
49dc8a552e -- fix 权限管理 2023-03-08 02:13:39 +08:00
yuping
ea9043889e Merge remote-tracking branch 'origin/develop' into develop 2023-03-08 01:17:59 +08:00
yuping
902d509e0f -- fix 权限管理 2023-03-08 01:17:44 +08:00
wyx
7cd5fd3043 fix:修改版本号 2023-03-08 01:12:45 +08:00
wyx
c32a74d6e1 Merge branch 'develop' into manage-release 2023-03-08 01:12:12 +08:00
wyx
d78f47d795 fix:路径图和项目编辑时原名字显示冲突问题 2023-03-08 01:11:33 +08:00
yuping
32601f080b Merge remote-tracking branch 'origin/develop' into develop 2023-03-08 01:07:23 +08:00
yuping
44dd643f41 -- fix 权限管理 2023-03-08 01:07:03 +08:00
wuxt
deb721bc88 fix:还原 .env 2023-03-08 00:51:27 +08:00
wuxt
a39464ba96 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-08 00:46:50 +08:00
wuxt
5299c44ceb fix:EQG-1081 小组进度查询显示小组数据 2023-03-08 00:46:34 +08:00
wyx
b25d07e592 fix:查看评估题目图片 2023-03-07 23:52:41 +08:00
wyx
7fd172679b fix:项目考试任务催促考试参数修改 2023-03-07 22:19:37 +08:00
wyx
4ae03e9cc7 fix:评估管理-学员情况-导出问题修改 2023-03-07 21:29:07 +08:00
wyx
d71185618d fix:查看投票问题显示问题 2023-03-07 20:45:28 +08:00
caozc
1d272d6f2e Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-07 18:30:30 +08:00
caozc
0316bf9fc9 fix: 显示 2023-03-07 18:30:12 +08:00
huangshengfa
b225d3be11 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !60
2023-03-07 18:10:19 +08:00
huangshengfa
683f74a7a0 Merge branch 'develop' into 'pre-dev'
# Conflicts:
#   src/components/NavLeft.vue
2023-03-07 18:10:11 +08:00