Commit Graph

2217 Commits

Author SHA1 Message Date
lixg
2a026d81ce feat:合并 2023-02-06 18:58:29 +08:00
lixg
c0a2d9d027 feat:增加证书学员分页获取 2023-02-06 18:57:34 +08:00
wyx
cefa6b10bc style:增加 路径图-外部考试-管理/导入成绩 2023-02-06 11:20:43 +08:00
wyx
a43b36ca3b style:增加 项目-外部考试-管理/导入成绩 2023-02-06 11:05:11 +08:00
yuping
d74ce4a12d Merge remote-tracking branch 'origin/develop' into develop 2023-02-06 03:22:16 +08:00
yuping
f70cc08321 --demand 项目管理 2023-02-06 03:22:04 +08:00
fooperage
6eec5fa0e3 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-02-05 15:31:43 +08:00
fooperage
9916667dd3 '关卡/任务保存草稿,确定时保存数据' 2023-02-05 14:57:39 +08:00
yuping
cbb9a6df3d --demand 页面权限 2023-02-05 02:06:45 +08:00
yuping
9e85855410 Merge remote-tracking branch 'origin/develop' into develop 2023-02-05 00:35:14 +08:00
yuping
b59f302cfd --fix bug 2023-02-05 00:34:59 +08:00
wyx
05266429da Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-04 22:40:08 +08:00
wyx
8dd06be24b feat:增加项目设置积分规则数据接入 2023-02-04 22:39:57 +08:00
lixg
3e3859872d feat:合并 2023-02-04 22:01:30 +08:00
lixg
ec6b3c551d feat:添加证书 2023-02-04 22:00:58 +08:00
fooperage
f50f250f37 '学习路径-关卡/任务拖动排序' 2023-02-04 19:40:34 +08:00
yuping
ae68315294 --fix 复烤开课数据 2023-02-04 18:49:45 +08:00
fooperage
77b5a34d7d '关卡和任务顺序调整' 2023-02-04 12:39:38 +08:00
yuping
0f21f9f13b Merge remote-tracking branch 'origin/develop' into develop 2023-02-04 01:50:07 +08:00
yuping
5eae2714a8 --fix bug 2023-02-04 01:49:52 +08:00
lixg
9d59f4c728 feat:增加证书上传封面等 2023-02-03 21:55:42 +08:00
lixg
a3ca45b775 feat:合并 2023-02-03 18:40:20 +08:00
wyx
4ab76ad76b fix:修改env配置及面授二维码协议判断 2023-02-03 17:00:41 +08:00
wyx
0935d4c252 fix:修改本地proxy获取不到windows.location对象报错 2023-02-03 16:42:57 +08:00
wyx
09418de1ef fix:修改本地proxy获取不到windows.location对象报错 2023-02-03 16:40:42 +08:00
wyx
531a9d37cb feat:修改部分协议接口自动获取(http/https) 2023-02-03 16:30:39 +08:00
wyx
0278434141 feat:增加项目积分-榜单-(学员积分榜、小组积分榜) 2023-02-03 15:17:40 +08:00
wyx
7ce64d1a83 style:评估管理创建题目支持选项图片上传 2023-02-03 09:42:24 +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