Commit Graph

2194 Commits

Author SHA1 Message Date
mx00085@163.com
d19aba8623 feat: 概览,学习组织数据接口联调 2023-02-20 14:33:36 +08:00
mx00085@163.com
e23339bea3 feat: 三期报表管理页面编写 2023-02-07 15:47:29 +08:00
15200171637
d5a93142a7 feat: 报表管理开发 2023-02-07 09:05:32 +08:00
yujicun
234574059e Merge remote-tracking branch 'origin/master' Mazheng 2023-01-20 11:44:44 +08:00
yuping
910bda73db --fix 2023-01-20 11:42:44 +08:00
yujicun
7e1b7922f0 Merge remote-tracking branch 'origin/master' 2023-01-20 10:24:15 +08:00
yuping
21ad2a141e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/App.vue
2023-01-20 04:48:03 +08:00
yuping
1d4bb72cc2 --fix 2023-01-20 04:47:47 +08:00
yuping
79778fdf65 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	src/App.vue
2023-01-20 04:47:32 +08:00
yuping
31aea503df --fix bug 2023-01-20 03:21:58 +08:00
yuping
59c05b9258 --fix bug 考试 2023-01-20 02:39:17 +08:00
yuping
c251a8e192 Merge remote-tracking branch 'origin/develop' into develop 2023-01-19 23:51:13 +08:00
yuping
52bababcbe --fix bug 考试 2023-01-19 23:50:57 +08:00
wyx
fd5b52bf47 Merge branch 'develop' 2023-01-19 17:19:58 +08:00
wyx
cad87d36cb fix:导入30s无反应结束请求,提示导入失败 2023-01-19 17:19:16 +08:00
wyx
a893fdefd7 exportP 2023-01-19 15:25:36 +08:00
wyx
f78cac0ea2 fix:加入方式判断 2023-01-19 10:37:37 +08:00
wyx
1767faa85c fix:项目/路径图/面授课学员部门全路径展示 2023-01-19 10:19:48 +08:00
wyx
5173e01cf3 style:项目公告时间样式问题 2023-01-19 10:03:51 +08:00
wyx
b46d4c8c2a style:上传附件超出 2023-01-19 09:44:26 +08:00
wyx
9c433a4472 style:上传附件超出 2023-01-19 09:43:26 +08:00
wyx
0e29925e2f fix:下载中心容量显示 2023-01-19 09:35:33 +08:00
yujicun
508d18d941 Merge remote-tracking branch 'origin/master' 2023-01-19 09:10:51 +08:00
wyx
d17d64c1d4 fix:修改版本号 2023-01-19 08:47:31 +08:00
yuping
302f5874c7 Merge remote-tracking branch 'origin/develop' 2023-01-19 02:08:17 +08:00
zhangyc
98d32fd6ee 面授课考试推送 2023-01-19 01:52:56 +08:00
wyx
7c28d8f874 Merge branch 'develop' 2023-01-18 22:56:52 +08:00
wyx
71fbba2cb2 fix:项目/路径图/面授学员管理加入方式展示修改 2023-01-18 22:56:05 +08:00
wyx
7f9df00064 fix:修改项目中在线课参数传递 2023-01-18 22:44:51 +08:00
wyx
3b08dfe999 fix:编辑面授课时,配置考试每次都为新建考试修改,不允许在原来考试基础上进行编辑。 2023-01-18 22:24:13 +08:00
wyx
8b259f57a3 fix:导入成绩接口超时提示失败,关闭转圈 2023-01-18 22:03:13 +08:00
dongruihua
e064759ab9 Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage
# Conflicts:
#	.env.prod
2023-01-18 19:24:22 +08:00
wyx
83652c661f fix:修改版本号 2023-01-18 18:20:03 +08:00
wyx
f2ca7e0ad6 Merge branch 'develop' 2023-01-18 18:19:23 +08:00
wyx
4365cdb0ed fix:在线课增加分页查询、学员模板环境变量配置修改。 2023-01-18 16:56:35 +08:00
wyx
e0f4c84ff0 fix:修改版本号 2023-01-18 08:52:55 +08:00
yuping
fe47aef108 --fix bug 2023-01-18 04:41:21 +08:00
yuping
f18dbcf24e --fix bug 2023-01-18 04:20:40 +08:00
yuping
81fae7234b --fix bug 2023-01-18 01:35:09 +08:00
yuping
2d193367b9 Merge remote-tracking branch 'origin/develop' into develop 2023-01-18 01:14:49 +08:00
yuping
90437c8175 --fix bug 2023-01-18 01:14:27 +08:00
wyx
2bdee845e0 fix:项目考试任务数据导出问题修改 2023-01-17 22:23:35 +08:00
yuping
2b85aaa07c Merge remote-tracking branch 'origin/develop' into develop 2023-01-17 22:10:01 +08:00
yuping
a54c6fa421 --fix bug 2023-01-17 22:09:53 +08:00
zhangyc
b4b462208f bug面授任务列表去掉关卡一栏 2023-01-17 22:06:28 +08:00
wyx
6023858f03 fix:面授课开课签到二维码增加taskType参数 2023-01-17 20:23:33 +08:00
yuping
a7bdb5f469 Merge remote-tracking branch 'origin/develop' into develop 2023-01-17 18:46:40 +08:00
yuping
106209e649 --fix bug 2023-01-17 18:46:29 +08:00
wyx
9235e07a5d fix:修改版本号 2023-01-17 17:36:36 +08:00
wyx
e03131a3c0 fix:面授课开课地点设置为非必填项 2023-01-17 17:35:57 +08:00