Commit Graph

4369 Commits

Author SHA1 Message Date
lpq
c96aeba472 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-24 21:35:23 +08:00
lpq
85eeceff3d 提交 2023-02-24 21:35:13 +08:00
lixg
2fa38d3abf feat:合并 2023-02-24 21:30:10 +08:00
lixg
48076bbbbb feat:修改项目说明提示框大小 2023-02-24 21:29:32 +08:00
caozc
5c551c79b8 fix:审核通过,在已审核项目的审核日志查到两条相同记录 2023-02-24 21:21:53 +08:00
wyx
2e2dac19d4 fix:项目/路径图-评估任务查看评估答题问题修复 2023-02-24 21:13:57 +08:00
wyx
b75a3b93bd fix:下载中心NAN显示判断修改 2023-02-24 20:59:03 +08:00
yuping
47015caf5a Merge remote-tracking branch 'origin/develop' into develop 2023-02-24 20:53:51 +08:00
lixg
910ab8eb69 feat:修改面授课封面图编辑 2023-02-24 20:50:53 +08:00
yuping
3c6ec2b9e9 -- fix bug 2023-02-24 20:44:09 +08:00
lixg
11ceb615b7 feat:合并 2023-02-24 20:34:56 +08:00
lixg
7bcae5724f feat:修改面授课回显问题 2023-02-24 20:32:18 +08:00
yuping
2396a4fcec Merge remote-tracking branch 'origin/develop' into develop 2023-02-24 19:20:16 +08:00
yuping
dec6af748a -- fix bug 2023-02-24 19:19:56 +08:00
wyx
035b348d5d fix:证书上传修改 2023-02-24 19:10:28 +08:00
wyx
1eab54dbe2 fix:证书上传增加upload 2023-02-24 18:37:29 +08:00
wyx
7d4adf0a27 fix:确定后清空组织树选中状态 2023-02-24 18:25:08 +08:00
wyx
57c8d3074f fix:项目/学习路径图添加学员-添加组织删除问题、组织搜索问题、关闭清空问题 2023-02-24 18:22:28 +08:00
dongruihua
9f08c0ffe2 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
#	src/components/BreadCrumb.vue
2023-02-24 17:18:11 +08:00
yuping
9aebd2b520 -- fix bug 2023-02-24 17:13:08 +08:00
yuping
b928bb771f -- fix bug 2023-02-24 17:11:30 +08:00
yuping
cd19dd7814 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
#	src/views/courselibrary/courseModal.vue
2023-02-24 17:06:28 +08:00
yuping
f00c0c4e1c -- fix bug 2023-02-24 17:04:23 +08:00
wyx
8ae44aebeb fix:学习路径图/项目-在线课导出数据修改 2023-02-24 17:00:50 +08:00
wyx
a94403b751 feat:更新在线课获取数据结构,增加在线课任务状态搜索。 2023-02-24 16:18:24 +08:00
lixg
a36f0b28b1 feat:增加编辑基础信息mianbaoxie 2023-02-24 16:01:14 +08:00
lixg
12358facc3 feat:合并 2023-02-24 15:49:16 +08:00
lixg
656d90e7a8 feat:修改项目设置里的编辑基本信息 2023-02-24 15:47:57 +08:00
wyx
7859b26aa7 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-24 15:29:14 +08:00
wyx
10c5e56699 feat:增加项目删除全部阶段 2023-02-24 15:29:06 +08:00
caozc
56d5a271f4 update 2023-02-24 14:32:55 +08:00
wyx
2b9bb50683 fix:增加学习路径图添加项目任务项目列表-所属项目字段 2023-02-24 14:17:27 +08:00
wyx
5cf7c5042f fix:字节换算修改 2023-02-24 14:10:38 +08:00
wyx
e94f577c6e fix:证书文件上传路径修改 2023-02-24 13:58:48 +08:00
lixg
2bd7282abe feat:修改投票 2023-02-24 13:34:57 +08:00
lixg
117f9b83c0 feat:合并 2023-02-24 12:26:01 +08:00
lixg
7f644963b1 feat:修改编辑项目任务 2023-02-24 12:24:21 +08:00
peiqingliu
0f5c0b4679 编辑小组最大人数 2023-02-24 12:07:22 +08:00
lixg
2d2173bd18 feat:合并 2023-02-24 11:32:06 +08:00
lixg
25bc245dd8 feat:修改评估任务及项目任务 2023-02-24 11:31:27 +08:00
wyx
dd2d456173 fix:id 2023-02-24 10:48:44 +08:00
lixg
8c1bcea020 feat:合并 2023-02-24 10:38:08 +08:00
lixg
945a552868 feat:修改新建面授课 2023-02-24 10:36:14 +08:00
wyx
04d7a41b48 feat:增加评估任务查看学员评估信息操作 2023-02-24 10:31:45 +08:00
dongruihua
6fac22c9d5 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
#	vue.config.js
2023-02-24 09:04:29 +08:00
yuping
40e92ffb0b -- fix bug 2023-02-24 04:40:16 +08:00
yuping
c41c8c74a4 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/CheckStu.vue
2023-02-24 04:36:07 +08:00
yuping
9e4ce50e77 -- fix bug 2023-02-24 04:35:19 +08:00
caozc
33411ed1e1 update 2023-02-24 00:48:29 +08:00
caozc
fb2ae2c3b4 update 2023-02-24 00:47:14 +08:00