4369 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yuping	f3740d6984	Merge remote-tracking branch 'origin/develop' into develop	2023-01-31 01:45:53 +08:00
yuping	000db01834	--fix 权限名单	2023-01-31 01:45:35 +08:00
wyx	f85ab247aa	style:去掉考勤签退时间及考勤状态条件搜索	2023-01-30 20:57:04 +08:00
wyx	e00206c8ef	feat:增加项目/学习路径图 活动考勤模块	2023-01-30 18:12:28 +08:00
wyx	9ca64c3987	feat:增加项目/学习路径直播 考勤模块	2023-01-30 18:04:57 +08:00
lixg	698062c0fd	feat:合并	2023-01-30 16:48:25 +08:00
lixg	86060275ac	feat:增加查看作业	2023-01-30 16:48:10 +08:00
wyx	0cbe945be0	feat:增加项目/学习路径图直播管理界面	2023-01-30 14:21:24 +08:00
yuping	01fd448638	Merge remote-tracking branch 'origin/develop' into develop	2023-01-30 13:20:25 +08:00
yuping	119db319f0	--fix 选择组织	2023-01-30 13:20:12 +08:00
wyx	7c27be2bd7	style:增加项目证书创建添加	2023-01-29 18:28:56 +08:00
lixg	8d85ff297e	feat:合并	2023-01-29 17:09:59 +08:00
lixg	322375508a	feat:增加待审核项目修改记录页面	2023-01-29 17:09:30 +08:00
wyx	09a1f2abf7	style:学习路径图基本信息	2023-01-29 14:41:33 +08:00
lixg	62b561fc78	feat:合并	2023-01-29 14:27:32 +08:00
lixg	c2657cd812	feat:增加查看作业	2023-01-29 14:27:05 +08:00
wyx	40c134a7cf	style:放开部分注释，二维码，项目排行榜等	2023-01-29 14:18:20 +08:00
wyx	f0973fc784	style:考勤页面注释放开	2023-01-29 11:41:36 +08:00
wyx	4698576317	feat:增加学习路径图概览模块	2023-01-29 09:48:51 +08:00
yuping	aee5aa2299	Merge remote-tracking branch 'origin/develop' into develop	2023-01-29 00:07:06 +08:00
yuping	97ff929bff	--fix 项目概览	2023-01-29 00:06:19 +08:00
wyx	b1a72a2b87	style:增加项目/学习路径图/模板库 新建课程、新建评估、新建项目（路径图）按钮 （跳转列表页目前）	2023-01-28 18:03:49 +08:00
lixg	9e979c2a06	feat:合并	2023-01-28 17:34:27 +08:00
wyx	1badfb721e	style:学习路径图/项目/模板库-增加讨论投票项目（学习路径）	2023-01-28 17:29:05 +08:00
wyx	163c909500	style:增加外部考试	2023-01-28 17:14:58 +08:00
lixg	bfb0a74f83	feat:合并	2023-01-28 16:46:37 +08:00
lixg	8aa96cd0ac	feat:增加随机分组	2023-01-28 16:44:23 +08:00
yuping	b6856d7195	--fix 配置	2023-01-28 16:34:11 +08:00
yuping	f36ce47d10	--fix version	2023-01-20 13:24:04 +08:00
yuping	b7f6ac3678	--fix 注释掉 项目 路径图 开课 复制功能 ... -- 注释 添加模板功能	2023-01-20 13:22:49 +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