Commit Graph

1214 Commits

Author SHA1 Message Date
yuping
a09bbd6fde --项目 阶段修改 2022-12-04 17:51:53 +08:00
zhangyc
40c13461fb Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 17:32:25 +08:00
wyx
39ad9b06da style:隐藏取消确定操作 2022-12-04 17:31:02 +08:00
zhangyc
ad883eabe8 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 17:30:26 +08:00
wyx
d4a36e2bb6 style:增加面授课查看弹框 2022-12-04 17:28:14 +08:00
wyx
52d6e24410 fix:学习路径图共享文档功能 2022-12-04 17:02:16 +08:00
wyx
b854ea028b fix:增加已审核项目所属项目审核说明字段展示 2022-12-04 16:48:14 +08:00
zhangyc
02b15ea14a 限制任务字数 2022-12-04 16:35:58 +08:00
yuping
a38ca44e6f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskAdd.vue
#	src/views/projectcenter/TaskPage.vue
2022-12-04 15:09:21 +08:00
yuping
db432bfc87 --项目 阶段 2022-12-04 15:05:50 +08:00
wyx
5d80b3eeea fix:代码合并 2022-12-04 15:01:26 +08:00
wyx
0a7a86a00e fix:代码合并 2022-12-04 15:00:02 +08:00
lixg
80ba40049a feat:合并 2022-12-04 14:20:22 +08:00
lixg
f74d1cc851 feat:合并 2022-12-04 14:17:26 +08:00
lixg
f9ffe051eb fix:修改同步学习记录选项 2022-12-04 14:16:13 +08:00
yuping
feb253afb7 Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 13:48:28 +08:00
yuping
7729503772 --项目 阶段 2022-12-04 13:48:16 +08:00
lixg
7e13091088 fix:修改项目编辑的BOEU是否实施 2022-12-04 13:21:25 +08:00
lixg
0f1a2c0b3e feat:合并 2022-12-04 13:07:21 +08:00
lixg
4f346edd09 feat:合并 2022-12-04 13:05:14 +08:00
lixg
669cadf152 fix:修改课程库的添加学员 2022-12-04 13:04:54 +08:00
yuping
6d96a3e66a Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 12:45:33 +08:00
yuping
36a902711e --项目 学员 2022-12-04 12:45:11 +08:00
wyx
8e0d6ae313 fix:项目/路径图任务大纲时间显示修改 2022-12-04 11:53:55 +08:00
wyx
ad9ce6c3e2 fix:模板库分页问题修复,隐藏学习时间字段 2022-12-04 11:45:06 +08:00
wyx
959b048915 fix:待审核课程预览问题,已审核项目审核说明字段添加 2022-12-04 11:12:24 +08:00
yuping
dd0ad2f508 Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 11:01:53 +08:00
yuping
c88ffd774c --项目 2022-12-04 11:01:44 +08:00
lixg
19d6bccea5 feat:合并 2022-12-04 10:34:58 +08:00
lixg
47ab70f4bb fix:修改关卡添加任务 2022-12-04 10:34:33 +08:00
zhangyc
9783334da6 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 06:45:57 +08:00
zhangyc
894de6dcd0 选择考试加校验 2022-12-04 06:45:48 +08:00
yuping
9d0ccff41e --项目设置基本信息 2022-12-04 02:46:04 +08:00
yuping
8af9e5e53f -- 修改 2022-12-04 02:35:38 +08:00
yuping
c2692a615c -- bug 项目 2022-12-03 20:07:39 +08:00
yuping
b49e47749d Merge remote-tracking branch 'origin/develop' into develop 2022-12-03 19:57:55 +08:00
yuping
fc6478dd28 -- bug 项目 2022-12-03 19:57:41 +08:00
lixg
966c47d3f1 feat:合并 2022-12-03 19:57:20 +08:00
lixg
e117dcdae4 feat:修改授权 2022-12-03 19:52:54 +08:00
wyx
14033bab39 fix:修改学习路径图/项目任务列表任务开始时间 2022-12-03 19:50:01 +08:00
zhangyc
494c5d64eb Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-03 19:42:54 +08:00
zhangyc
988683b1d5 考试 字段校验,没传考试id 2022-12-03 19:40:34 +08:00
yuping
3c657d0b25 -- bug 项目经理 2022-12-03 19:25:52 +08:00
yuping
fc28b6950c Merge remote-tracking branch 'origin/develop' into develop 2022-12-03 18:53:48 +08:00
yuping
db610d81c1 -- bug 登出 2022-12-03 18:53:38 +08:00
zhangyc
67982d3720 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-03 18:52:32 +08:00
wyx
603c0b4c07 fix:修改面授课列表信息分页展示问题 2022-12-03 18:25:42 +08:00
zhangyc
c44ac4b0e9 配置文件 2022-12-03 18:19:20 +08:00
wyx
44e0ecf40a fix:修改项目/学习路径图任务大纲显示问题 2022-12-03 17:57:30 +08:00
yuping
16aec52764 -- bug 项目搜索时间 2022-12-03 17:47:00 +08:00