Commit Graph

2354 Commits

Author SHA1 Message Date
yuping
fffea9689d Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/UnlockMode.vue
#	src/views/learningpath/LevelAddDetail.vue
2023-02-16 18:32:49 +08:00
wyx
36f763559b feat:增加学习路径图学习模式切换 2023-02-16 18:24:37 +08:00
peiqingliu
31ef85f566 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-16 17:56:23 +08:00
wyx
ea9d565c8c fix:路径图管理跳转问题修改 2023-02-16 17:55:50 +08:00
peiqingliu
ae7f35e8ac Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-16 17:54:18 +08:00
peiqingliu
17c69e9c23 1、修改组员查询。2、组员删除 2023-02-16 17:53:58 +08:00
wyx
8602518cb1 style:闯关模式选择项目和路径图不一致调整 2023-02-16 17:33:16 +08:00
yuping
6f3ac7b810 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/api/indexLearningPath.js
2023-02-16 17:21:18 +08:00
yuping
f2fd47a078 --fix 路径图整体修改 2023-02-16 17:19:14 +08:00
wyx
5591a98e33 fix:更新调试项目、学习路径图共享文档编辑 2023-02-16 16:55:55 +08:00
wyx
3000423281 style:面授课查看答卷增加查看答卷弹框 2023-02-16 16:32:39 +08:00
yuping
18cc286294 --fix 路径图整体修改 2023-02-16 13:10:18 +08:00
yuping
cf1acb09a6 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/AssessmentAll.vue
2023-02-16 13:09:08 +08:00
yuping
00c50a9e3c --fix 路径图整体修改 2023-02-16 13:08:35 +08:00
李东进1
0dbe889182 2023-2-15bug修复 2023-02-15 23:49:40 +08:00
wyx
64190bf772 fix:模板库报错问题修改 2023-02-15 22:01:02 +08:00
wyx
2230296209 fix:任务阶段id修改 2023-02-15 18:07:45 +08:00
wyx
ac1382a182 fix:外部考试查询学员参数传递修改 2023-02-15 17:13:42 +08:00
wyx
e0f16a8de9 fix:学习路径图结束后隐藏启用按钮 2023-02-15 09:54:12 +08:00
wyx
e125c5382e fix:学员加入方式-手动加入-导入 2023-02-15 09:29:44 +08:00
lixg
2057213b69 feat:合并 2023-02-14 20:57:09 +08:00
lixg
0dbed0a9c7 feat:增加项目内学员 2023-02-14 20:56:37 +08:00
wyx
a207e25592 style:增加邀请审核操作界面 2023-02-14 18:55:47 +08:00
wyx
a497b405ae fix:添加评估任务,创建人名显示问题修改 2023-02-14 17:17:40 +08:00
wyx
57681e0725 fix:移除学习路径图部分storage 2023-02-14 15:46:29 +08:00
lixg
3d871fef21 feat:合并 2023-02-14 15:40:45 +08:00
lixg
d2bb0fabfc feat:修改随机分组等 2023-02-14 15:40:17 +08:00
wyx
6592100970 fix:未使用提示报错修改 2023-02-14 13:56:13 +08:00
fooperage
370703c7d2 '去掉一个导出' 2023-02-14 11:43:15 +08:00
wyx
830656649d fix:项目直播数据导出 2023-02-14 11:22:56 +08:00
wyx
7f2b29a7b4 fix:编辑面授任务时间修改 2023-02-14 02:50:07 +08:00
wyx
aaefa3e2af fix:修改面授课任务添加 2023-02-14 02:33:27 +08:00
wyx
6869af05c3 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-14 01:46:00 +08:00
wyx
980d6e578d fix:面授课创建问题 2023-02-14 01:45:50 +08:00
yuping
4016fe6a64 Merge remote-tracking branch 'origin/develop' into develop 2023-02-14 01:37:54 +08:00
yuping
f9c0d266a8 --fix 路径图草稿 2023-02-14 01:37:40 +08:00
wyx
d6f0d974ce fix:修改路径图任务模块项目的添加和编辑 2023-02-14 01:35:59 +08:00
wyx
0e66e877a1 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-14 01:28:36 +08:00
wyx
461518239b fix:项目发布错误修改 2023-02-14 01:28:25 +08:00
lixg
1c69724d3f feat:合并 2023-02-14 01:20:18 +08:00
lixg
1fcd299abc feat:接入添加小组成员数据 2023-02-14 01:18:10 +08:00
wyx
cbbe03a206 fix:作业及外链编辑 2023-02-14 00:53:04 +08:00
wyx
ec533355d0 fix:任务ID传递 2023-02-14 00:39:07 +08:00
fooperage
ff8533e607 '..' 2023-02-14 00:10:33 +08:00
fooperage
a70cddd87d Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-02-13 23:47:09 +08:00
fooperage
ef1898c613 '..' 2023-02-13 23:45:58 +08:00
wyx
0a236e0187 fix:直播id 2023-02-13 23:34:36 +08:00
wyx
ae1f2149f9 feat:编辑作业ID修改 2023-02-13 22:28:44 +08:00
wyx
603a4aa255 feat:增加所有任务传参 2023-02-13 21:50:54 +08:00
wyx
c10b3ffce2 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-13 21:08:13 +08:00