Commit Graph

2190 Commits

Author SHA1 Message Date
yuping
5eae2714a8 --fix bug 2023-02-04 01:49:52 +08:00
yuping
3647b3c653 Merge remote-tracking branch 'origin/develop' into develop 2023-02-03 01:12:02 +08:00
yuping
ba30022c16 --fix bug 2023-02-03 01:11:53 +08:00
fooperage
9e03c2db7c '学习模式处改成下拉框' 2023-02-02 22:36:21 +08:00
wyx
4c1d917570 feat:项目编辑,项目的开始时间不能选择开始时间之后的时间。 2023-02-02 19:48:09 +08:00
yuping
19a83e2d26 Merge remote-tracking branch 'origin/develop' into develop 2023-02-02 10:38:21 +08:00
yuping
efd6f9412d --fix bug 2023-02-02 10:38:02 +08:00
fooperage
6b1638e55c '修改路径下的学习模式' 2023-02-02 09:24:26 +08:00
yuping
e15cabe750 --demand 添加权限 2023-02-01 23:25:21 +08:00
yuping
0f498f55c6 --demand 添加权限 2023-02-01 20:26:03 +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
yuping
55c868231b --demand 添加权限 2023-02-01 13:25:57 +08:00
yuping
e8c888e668 Merge remote-tracking branch 'origin/develop' into develop 2023-02-01 13:21:24 +08:00
yuping
04f43c96e3 --demand 添加权限 2023-02-01 13:21:02 +08:00
yuping
d73dba81c8 --fix 权限名单 2023-02-01 12:09:56 +08:00
wyx
78a64ee997 style:保存、暂存放开 2023-02-01 08:48:48 +08:00
wyx
48e8d95a20 style:项目、路径图、模板库--学习模式 2023-01-31 19:32:43 +08:00
wyx
18bffa1512 fix 2023-01-31 18:49:05 +08:00
wyx
409bc0819a Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-01-31 18:42:48 +08:00
wyx
42fe8a07ec feat:增加学习路径图 项目管理模块 2023-01-31 18:42:39 +08:00
yuping
08772c14f8 --fix 添加归属权 2023-01-31 17:52:03 +08:00
yuping
7073c4addc --fix 添加归属权 2023-01-31 17:46:59 +08:00
yuping
f30300d326 --fix 添加归属权 2023-01-31 17:34:18 +08:00
yuping
d43ea119d6 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/student/TableModelStudent.vue
#	src/views/projectcenter/ProjectAdd.vue
#	src/views/projectcenter/ProjectManage.vue
2023-01-31 17:32:10 +08:00
yuping
9e972b2ae4 --fix 添加归属权 2023-01-31 17:27:58 +08:00
wyx
961396eb0b Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-01-31 16:14:22 +08:00
wyx
650cbef2e3 fix 2023-01-31 16:14:16 +08:00
lixg
8beb086909 feat:合并 2023-01-31 16:08:34 +08:00
lixg
f0a8d8c70c feat:增加换组弹窗 2023-01-31 16:06:48 +08:00
wyx
8e67c5496e style:学习路径项目管理弹窗 2023-01-31 16:04:52 +08:00
wyx
8d2853f707 style:考勤签到/请假状态显示 2023-01-31 14:43:36 +08:00
lixg
94db05c7ee feat:合并 2023-01-31 13:46:24 +08:00
lixg
592e3d3246 feat:增加小组管理页面 2023-01-31 13:41:31 +08:00
yuping
a4542cf798 Merge remote-tracking branch 'origin/develop' into develop 2023-01-31 13:32:43 +08:00
yuping
5f4bc8301f --fix 添加归属权 2023-01-31 13:32:30 +08:00
wyx
fb97a1c212 fix:考勤搜索字段修改 2023-01-31 12:15:11 +08:00
yuping
102423c211 Merge remote-tracking branch 'origin/develop' into develop 2023-01-31 11:47:54 +08:00
yuping
686ac406fd --fix 权限名单 2023-01-31 11:47:26 +08:00
wyx
3effab1346 feat:增加外部考试 2023-01-31 10:55:39 +08:00
lixg
1d0cf629aa feat:合并 2023-01-31 10:33:32 +08:00
wyx
6ae5d66e20 fix 2023-01-31 08:42:27 +08:00
yuping
f3740d6984 Merge remote-tracking branch 'origin/develop' into develop 2023-01-31 01:45:53 +08:00
yuping
000db01834 --fix 权限名单 2023-01-31 01:45:35 +08:00
wyx
f85ab247aa style:去掉考勤签退时间及考勤状态条件搜索 2023-01-30 20:57:04 +08:00
wyx
e00206c8ef feat:增加项目/学习路径图 活动考勤模块 2023-01-30 18:12:28 +08:00
wyx
9ca64c3987 feat:增加项目/学习路径直播 考勤模块 2023-01-30 18:04:57 +08:00