Commit Graph

1838 Commits

Author SHA1 Message Date
yuping
00edbdd03c Merge remote-tracking branch 'origin/develop' 2022-12-30 21:01:53 +08:00
yuping
bde32b20ad ---发布项目不允许删除 2022-12-30 20:57:34 +08:00
yuping
35ae40630f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/App.vue
2022-12-30 20:44:44 +08:00
yuping
8cb0910a53 Merge branch 'develop'
# Conflicts:
#	src/App.vue
2022-12-30 20:44:06 +08:00
yuping
5e6ac5dbc0 ---项目详情排名 2022-12-30 20:42:07 +08:00
yuping
53c8f79fb8 Merge remote-tracking branch 'origin/develop' into develop 2022-12-30 19:38:39 +08:00
yuping
a9a470359e ---项目详情排名 2022-12-30 19:38:22 +08:00
wyx
5f8b223ca1 Merge branch 'develop' 2022-12-30 18:46:02 +08:00
wuyx
e01298015c fix:选择测评表格备注/可答题人数字段修改 2022-12-30 18:44:32 +08:00
wyx
396a4ce6cc fix:修改版本号 2022-12-30 18:38:21 +08:00
wyx
47d7be18e3 fix:修改版本号 2022-12-30 18:31:30 +08:00
wyx
d9dc6db40b Merge branch 'develop' 2022-12-30 18:24:17 +08:00
yuping
a01d895224 Merge remote-tracking branch 'origin/develop' 2022-12-30 16:25:21 +08:00
zhangyc
15bec4c197 查看阶段说明 2022-12-30 15:54:07 +08:00
wyx
815b6ac473 fix:修改版本号 2022-12-30 15:38:42 +08:00
zhangyc
8dc4e87011 面授里添加考试回传考试名称 2022-12-30 15:37:06 +08:00
wyx
53f30677c6 fix:面授课新建后点击编辑报错问题,销毁Editor内容 2022-12-30 15:36:06 +08:00
wyx
19bcde539c fix:面授课分类显示及红色错误弹框修改 2022-12-30 13:31:33 +08:00
wyx
81f7a0e2ca fix:修改版本号 2022-12-30 11:06:00 +08:00
wyx
8d41256414 fix:头部导航栏管理员界面跳转问题 2022-12-30 10:40:03 +08:00
zhangyc
e52ea95972 查看学员无阶段任务 2022-12-29 20:20:58 +08:00
zhangyc
73fa8d9f1e 学员查看 2022-12-29 20:00:39 +08:00
yuping
daf8d29570 ---项目经理 和 组织树异步加载 2022-12-29 18:58:49 +08:00
yuping
5d18b7061b Merge remote-tracking branch 'origin/develop' into develop 2022-12-29 14:24:42 +08:00
yuping
d181177f41 ---项目审核意见 2022-12-29 12:12:46 +08:00
wyx
cd5e3fd097 fix:修改添加面授课编辑面授课时时间回显问题,修改创建调研问题字段长度 2022-12-29 11:12:08 +08:00
yuping
63e7e72b44 Merge remote-tracking branch 'origin/manage-release'
# Conflicts:
#	src/App.vue
2022-12-28 22:07:16 +08:00
yuping
f1d8ef54a4 ---版本 2022-12-28 21:55:50 +08:00
yuping
9b560857ad Merge branch 'develop' into manage-release 2022-12-28 21:54:48 +08:00
yuping
406d2c3e1c ---登出bug 2022-12-28 21:36:00 +08:00
yuping
3d0ec66e49 Merge remote-tracking branch 'origin/develop' into develop 2022-12-28 21:34:35 +08:00
yuping
f089aeb639 ---登出bug 2022-12-28 21:34:13 +08:00
yuping
d32890bebc ---版本 2022-12-28 20:02:15 +08:00
yuping
4f9e163a1b Merge remote-tracking branch 'origin/manage-release' 2022-12-28 19:59:36 +08:00
yuping
9d405c7350 Merge remote-tracking branch 'origin/manage-release' into manage-release 2022-12-28 19:04:43 +08:00
yuping
2b1fc546ad ---版本 2022-12-28 19:04:27 +08:00
wyx
1e365877d3 Merge branch 'develop' into manage-release 2022-12-28 10:19:40 +08:00
wyx
08e88f587e fix:修改版本号 2022-12-28 10:18:12 +08:00
wyx
50dc3d188a fix:隐藏项目/学习路径图/模板库考试任务的编辑按钮 2022-12-28 10:16:51 +08:00
yuping
a80e94b17f ---版本 2022-12-28 10:10:13 +08:00
wyx
664ae94e6e fix:添加学员确定后清空搜索框内容 2022-12-27 22:22:23 +08:00
yuping
6e5736960c Merge branch 'develop' 2022-12-27 21:02:23 +08:00
yuping
f4b528e45f Merge remote-tracking branch 'origin/develop' into develop 2022-12-27 21:00:52 +08:00
yuping
2c9de25f53 上线配置 2022-12-27 21:00:45 +08:00
wyx
63b83e4ca6 fix:修改版本号 2022-12-27 20:56:44 +08:00
wyx
93c75bff8d fix:新建考试地址修改 2022-12-27 18:31:43 +08:00
yuping
6877317691 -- 学员搜索 2022-12-27 16:10:17 +08:00
wyx
a9350027b6 fix:锁定项目/学习路径图操作面板 2022-12-27 14:53:04 +08:00
wyx
6e8840ba28 fix:添加学员搜索问题修改 2022-12-27 14:47:43 +08:00
wuyx
5857bef8ec fix:修改版本号 2022-12-27 10:21:15 +08:00