Commit Graph

1552 Commits

Author SHA1 Message Date
yuping
034a75424a -- 添加学员 2022-12-18 13:49:23 +08:00
yuping
d057c9b66c Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskPage.vue
2022-12-17 17:41:47 +08:00
yuping
c1983082a5 -- 添加学员 2022-12-17 17:40:47 +08:00
zhangyc
94e0982817 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-16 17:47:35 +08:00
zhangyc
6bd7df51f9 直播时间 2022-12-16 16:24:35 +08:00
yuping
9090261a8f -- 修改 2022-12-16 14:27:06 +08:00
yuping
47aa65ff43 -- 修改 2022-12-16 14:13:00 +08:00
yuping
faab473261 -- 修改 2022-12-16 14:11:46 +08:00
yuping
3a7c6e4601 -- 修改 2022-12-16 14:00:55 +08:00
yuping
eaf36fe377 Merge remote-tracking branch 'origin/develop' into develop 2022-12-16 13:55:00 +08:00
yuping
9784f84db3 -- 修改 2022-12-16 13:54:26 +08:00
zhangyc
db5f335e1a 版本号 2022-12-16 09:22:29 +08:00
zhangyc
4622244be1 基础信息归属组织打印 2022-12-16 09:16:18 +08:00
zhangyc
e90aaf83e4 归属组织打印 2022-12-16 08:51:44 +08:00
zhangyc
e7a3d00140 课程名、项目名称修改提示重复 2022-12-16 01:21:02 +08:00
zhangyc
50c1583c46 时间去掉秒 2022-12-16 00:59:45 +08:00
zhangyc
b3e568176e 项目时间搜索 2022-12-16 00:01:56 +08:00
zhangyc
e98d3cd5ea 撤回的评估 还在添加评估列表里 2022-12-15 20:05:08 +08:00
zhangyc
59f4ad9d09 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-15 11:55:33 +08:00
zhangyc
00c122042c 测评增加type字段 2022-12-15 11:55:27 +08:00
yuping
fd19dd049c -- 环境更改1 2022-12-14 23:55:02 +08:00
yuping
12c3a1ce72 -- 环境更改 2022-12-14 21:21:58 +08:00
yuping
a542608dfe -- 环境更改 2022-12-14 21:11:15 +08:00
zhangyc
d67b751a4e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 21:00:56 +08:00
zhangyc
2264a83499 课程搜索 2022-12-14 21:00:49 +08:00
lixg
d05fd14aae feat:合并 2022-12-14 20:56:22 +08:00
lixg
eece67eb22 fix:修改添加任务项目列表 2022-12-14 20:55:34 +08:00
yuping
fffc5c66b2 -- bug 2022-12-14 20:50:46 +08:00
yuping
74e41e9abe Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 20:36:58 +08:00
yuping
42340e38d0 -- bug 2022-12-14 20:36:37 +08:00
lixg
652282773f feat:修改 2022-12-14 17:52:13 +08:00
lixg
6dda7355a6 feat:合并 2022-12-14 17:37:25 +08:00
lixg
a97d9d023d feat:合并 2022-12-14 17:24:27 +08:00
lixg
37cb81763a fix:修改版本号 2022-12-14 17:24:00 +08:00
yuping
1ce9bf7c4d Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/project/ProjectLevel.vue
#	src/views/projectcenter/templateAdd.vue
2022-12-14 17:04:34 +08:00
yuping
6909dedb98 -- bug 2022-12-14 17:03:28 +08:00
zhangyc
4b12a51f51 merge 2022-12-14 16:04:10 +08:00
zhangyc
117dd5f184 隐藏缺失字段 2022-12-14 16:00:23 +08:00
lixg
16b329ff24 feat:合并 2022-12-14 15:48:40 +08:00
lixg
497b7449cb fix:修改未审核课程预览附件名称显示问题 2022-12-14 15:46:33 +08:00
yuping
3b750a61bd Merge remote-tracking branch 'origin/develop' into develop 2022-12-14 15:31:20 +08:00
yuping
474a360dc6 -- bug 2022-12-14 15:17:03 +08:00
lixg
f0603eda14 feat:合并 2022-12-14 15:10:22 +08:00
lixg
5bbe79f325 fix:修改面授课开课附件显示以及待审核课程附件下载 2022-12-14 15:09:36 +08:00
yuping
a573498512 -- bug 2022-12-14 14:28:58 +08:00
yuping
57d83419dc -- bug 2022-12-14 14:27:05 +08:00
zhangyc
6d855e37c0 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 14:12:40 +08:00
zhangyc
233d334840 修复提示请选中关卡问题 2022-12-14 14:09:01 +08:00
lixg
ad8f211a82 feat:合并 2022-12-14 13:51:32 +08:00
lixg
a665762f01 fix:修改项目未通过筛选问题 2022-12-14 12:10:27 +08:00