Commit Graph

2392 Commits

Author SHA1 Message Date
yuping
84106e4fb1 --fix 字典管理 2023-02-17 18:21:25 +08:00
yuping
5517799a74 Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 17:59:42 +08:00
yuping
33429c046c --fix bug 2023-02-17 17:59:25 +08:00
wyx
8b036dacb5 fix:评估列表修改创建人和题目数量,修改新建评估样式 2023-02-17 17:24:10 +08:00
wyx
cfdb1b52ef Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-17 16:24:38 +08:00
wyx
b6f0489496 fix:考试任务-增加系统和外部考试区分-增加编辑区分 2023-02-17 16:24:30 +08:00
yuping
b1dde8f3a7 --fix 排序 2023-02-17 16:23:14 +08:00
yuping
15ec385b5a Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 16:12:23 +08:00
yuping
70f6d01594 --fix 排序 2023-02-17 16:12:01 +08:00
wyx
7608d56432 feat:增加转审完成查看 2023-02-17 14:34:57 +08:00
wyx
69835350af fix:投票编辑 2023-02-17 12:25:31 +08:00
wyx
a7d30f3f8b fix:任务管理学员显示问题修改 2023-02-17 11:37:16 +08:00
wyx
50d91e5510 feat:增加已审核课程日志显示部分数据接入 2023-02-17 10:54:26 +08:00
wyx
1e6002d7d4 fix:评估管理创建人显示修改 2023-02-17 10:37:13 +08:00
wyx
9429f27c73 fix:直播任务添加封面图 2023-02-17 10:09:54 +08:00
yuping
6f25303a58 --fix bug 2023-02-17 03:58:53 +08:00
yuping
5f3cc4147c --fix bug 2023-02-17 01:55:21 +08:00
yuping
cb2e5b6ccf --fix bug 2023-02-17 01:49:17 +08:00
yuping
00ebe94f2b Merge remote-tracking branch 'origin/develop' into develop 2023-02-17 01:29:38 +08:00
yuping
fcf09a9b3d --fix bug 2023-02-17 01:29:19 +08:00
李东进1
da6ccbad1c 2023-02-17bug修复 2023-02-17 00:50:24 +08:00
yuping
c62b2c1591 --fix bug 2023-02-17 00:41:26 +08:00
yuping
effd83db96 --fix bug 2023-02-17 00:15:28 +08:00
yuping
a725f73191 --fix bug 2023-02-16 22:23:03 +08:00
yuping
0cedfb5e5e Merge remote-tracking branch 'origin/develop' into develop 2023-02-16 22:16:26 +08:00
yuping
e29385460a --fix bug 2023-02-16 22:16:13 +08:00
quhongwei
c24baaee41 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-02-16 22:11:58 +08:00
quhongwei
650b374513 回滚配置 2023-02-16 22:11:47 +08:00
yuping
32e0eebb27 Merge remote-tracking branch 'origin/develop' into develop 2023-02-16 22:03:55 +08:00
yuping
acabc1556c --fix bug 2023-02-16 22:03:45 +08:00
wyx
c7b6874cda Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-16 21:58:05 +08:00
wyx
034d6be78b fix:增加批量报名页面,替换外部考试学员成绩导入模板下载链接 2023-02-16 21:57:56 +08:00
yuping
36b6e820c3 --fix bug 2023-02-16 19:45:38 +08:00
yuping
21f0f8d069 Merge remote-tracking branch 'origin/develop' into develop 2023-02-16 19:26:38 +08:00
yuping
e21c4a03ab --fix 项目草稿 2023-02-16 19:26:29 +08:00
wyx
9ce431bd57 style:学习模式后方显示样式调整 2023-02-16 19:16:33 +08:00
wyx
af6ad627f9 fix:修改学习路径学习模式切换 2023-02-16 19:04:44 +08:00
yuping
40dc5f939e --fix 路径图整体修改 2023-02-16 18:39:17 +08:00
yuping
fffea9689d Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/UnlockMode.vue
#	src/views/learningpath/LevelAddDetail.vue
2023-02-16 18:32:49 +08:00
wyx
36f763559b feat:增加学习路径图学习模式切换 2023-02-16 18:24:37 +08:00
peiqingliu
31ef85f566 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-16 17:56:23 +08:00
wyx
ea9d565c8c fix:路径图管理跳转问题修改 2023-02-16 17:55:50 +08:00
peiqingliu
ae7f35e8ac Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-16 17:54:18 +08:00
peiqingliu
17c69e9c23 1、修改组员查询。2、组员删除 2023-02-16 17:53:58 +08:00
wyx
8602518cb1 style:闯关模式选择项目和路径图不一致调整 2023-02-16 17:33:16 +08:00
yuping
6f3ac7b810 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/api/indexLearningPath.js
2023-02-16 17:21:18 +08:00
yuping
f2fd47a078 --fix 路径图整体修改 2023-02-16 17:19:14 +08:00
wyx
5591a98e33 fix:更新调试项目、学习路径图共享文档编辑 2023-02-16 16:55:55 +08:00
wyx
3000423281 style:面授课查看答卷增加查看答卷弹框 2023-02-16 16:32:39 +08:00
yuping
18cc286294 --fix 路径图整体修改 2023-02-16 13:10:18 +08:00