Commit Graph

3698 Commits

Author SHA1 Message Date
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
wyx
8de5896eee Merge branch 'develop' into manage-release 2023-03-07 18:05:11 +08:00
wyx
07b5f9d6bc fix:项目撤回结束 2023-03-07 18:04:55 +08:00
huangshengfa
45dfb20d38 Merge branch 'pre-release' into 'release'
Pre release

See merge request !59
2023-03-07 18:03:45 +08:00
wyx
e84805517c fix:修改版本号 2023-03-07 17:57:45 +08:00
wyx
ad1ced6ae9 Merge branch 'develop' into manage-release 2023-03-07 17:57:14 +08:00
lixg
5d8f12fca2 feat:合并 2023-03-07 17:48:44 +08:00
lixg
9c4510b7e3 feat:修改面授课 2023-03-07 17:48:20 +08:00
yuping
e3cec35d86 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskPage.vue
2023-03-07 17:46:05 +08:00
yuping
164f30c793 -- fix bug 2023-03-07 17:43:51 +08:00
wyx
aeef3f9725 fix:学习路径图列表已发布路径不允许编辑 2023-03-07 17:38:42 +08:00
wyx
8c8db9e08f fix:项目共享文档 2023-03-07 17:26:26 +08:00
peiqingliu
5c962b4009 修改组长导入 2023-03-07 16:48:43 +08:00
wyx
63eafe934b feat:增加教师入口跳转链接 2023-03-07 16:07:10 +08:00
yuping
bec0b6e817 Merge remote-tracking branch 'origin/develop' into develop 2023-03-07 15:47:22 +08:00
yuping
7b544f9acf -- fix bug 2023-03-07 15:47:09 +08:00
lixg
eaefc4ebd7 feat:修改导航 2023-03-07 12:56:27 +08:00
peiqingliu
7bef214bd6 编辑小组时,接口超时 2023-03-07 11:04:23 +08:00
huangshengfa
fb76fe6471 Merge branch 'pre-release' into 'release'
Pre release

See merge request !58
2023-03-07 09:29:55 +08:00
dongruihua
8bd0d07041 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-07 09:21:04 +08:00
wyx
36788462da fix:修改版本号 2023-03-07 02:01:04 +08:00
wyx
49f0cdbaff Merge branch 'develop' into manage-release 2023-03-07 02:00:27 +08:00