Commit Graph

119 Commits

Author SHA1 Message Date
wyx
e125c5382e fix:学员加入方式-手动加入-导入 2023-02-15 09:29:44 +08:00
yuping
efd6f9412d --fix bug 2023-02-02 10:38:02 +08:00
yuping
39faeee056 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
#	src/views/learningpath/LearningPath.vue
#	src/views/learningpath/LevelAdd.vue
2023-02-01 20:25:12 +08:00
yuping
2b00230efa --demand 添加权限 2023-02-01 20:19:45 +08:00
lixg
5e4b712a18 feat:合并 2023-02-01 17:33:42 +08:00
lixg
511f8cced3 feat:增加面授课成绩录入结业批量结业 2023-02-01 17:31:29 +08:00
yuping
5b8e8a691b --demand 添加权限 2023-02-01 17:24:03 +08:00
lixg
f0a8d8c70c feat:增加换组弹窗 2023-01-31 16:06:48 +08:00
lixg
592e3d3246 feat:增加小组管理页面 2023-01-31 13:41:31 +08:00
lixg
1d0cf629aa feat:合并 2023-01-31 10:33:32 +08:00
yuping
000db01834 --fix 权限名单 2023-01-31 01:45:35 +08:00
wyx
f78cac0ea2 fix:加入方式判断 2023-01-19 10:37:37 +08:00
wyx
1767faa85c fix:项目/路径图/面授课学员部门全路径展示 2023-01-19 10:19:48 +08:00
wyx
71fbba2cb2 fix:项目/路径图/面授学员管理加入方式展示修改 2023-01-18 22:56:05 +08:00
wyx
0d9f91ca79 fix:去掉面授管理中对学员进行得操作-通过、拒绝 2023-01-17 15:31:14 +08:00
yuping
c542beacfd --fix bug 2023-01-17 01:04:46 +08:00
yuping
f7f245e1c2 --fix 面授课 与任务分开 2023-01-16 17:18:32 +08:00
zhangyc
7a1f40df5b style:弹窗 2023-01-15 22:00:56 +08:00
yuping
14cd052ec0 --fix 作业下载模板 2023-01-14 01:03:13 +08:00
wyx
156e84d273 feat:增加学习路径图-学员管理-导出学习信息 2023-01-13 16:10:48 +08:00
zhangyc
e879d251d2 style:学员列表表格样式 2023-01-13 00:59:11 +08:00
lixg
d362e2a258 feat:修改活动直播任务签到时间 2023-01-12 17:42:43 +08:00
lixg
7235dac9b8 feat:修改签到二维码 2023-01-12 12:16:24 +08:00
zhangyc
e8d4c179f5 style:项目下作业面授导出参数错误,隐藏部分按钮 2023-01-12 02:47:46 +08:00
yuping
c04574fc40 -- bug 2023-01-12 01:37:28 +08:00
yuping
6edca7555f Merge remote-tracking branch 'origin/develop' into develop 2023-01-11 18:21:53 +08:00
yuping
deaed0e4c0 -- 导出地址 2023-01-11 18:21:44 +08:00
lixg
397071c425 feat:登录项目和学习路径导入学员 2023-01-11 17:40:28 +08:00
lixg
55a64cd6ef feat:增加面授导入成绩以及修改签到 2023-01-11 16:46:40 +08:00
zhangyc
fdcdbde214 style:表格样式调整 2023-01-10 18:13:37 +08:00
lixg
a9921489d7 feat:增加面授课成绩录入 2023-01-10 18:00:51 +08:00
zhangyc
e787525e13 导出 2023-01-10 13:29:08 +08:00
lixg
810aaa199a feat:修改导出作业 2023-01-09 17:57:25 +08:00
lixg
72d2e7b987 feat:增加导出作业 2023-01-07 19:48:29 +08:00
lixg
8346807ce0 feat:增加批量标注完成等 2023-01-07 14:41:16 +08:00
lixg
8cb9c6649e feat:增加签到签退等 2023-01-06 17:07:57 +08:00
lixg
78119e4093 feat:增加面授课成绩导入 2023-01-04 15:04:21 +08:00
lixg
9b3f9e47ee style:修改面授课 2023-01-03 20:00:06 +08:00
lixg
cea80310dd style:增加项目学员样式 2023-01-03 17:52:58 +08:00
zhangyc
73fa8d9f1e 学员查看 2022-12-29 20:00:39 +08:00
yuping
d090544399 -- 学员审核 2022-12-26 23:12:00 +08:00
yuping
876d1b715a Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/student/TableStudent.vue
2022-12-26 17:29:49 +08:00
yuping
5e4e6f16b7 -- 查看 2022-12-26 17:19:21 +08:00
wuyx
ea67d8530b fix:样式修改 2022-12-26 16:40:12 +08:00
wuyx
2087e151bb style:部分学员样式添加 2022-12-26 16:16:17 +08:00
zhangyc
be9f5d9d91 作业改为任务 2022-12-23 09:24:45 +08:00
zhangyc
2a6678fb23 样式bug修改 2022-12-23 01:38:22 +08:00
yuping
b44e070069 -- 合并冲突 2022-12-22 19:18:49 +08:00
yuping
7668dc6616 Merge remote-tracking branch 'origin/manage-release' into manage-release
# Conflicts:
#	src/components/student/ChangeLevelModal.vue
#	src/components/student/TableStudent.vue
2022-12-22 19:08:42 +08:00
yuping
7dfaf3a3b0 Merge branch 'develop' into manage-release
# Conflicts:
#	src/App.vue
#	src/components/drawers/AddHomework.vue
#	src/components/drawers/AddTest.vue
#	src/components/student/ChangeLevelModal.vue
#	src/components/student/TableStudent.vue
#	src/views/examine/ProjectReviewed.vue
2022-12-22 19:05:26 +08:00