Commit Graph

1541 Commits

Author SHA1 Message Date
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
9b426e5695 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 16:04:15 +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
zhangyc
8310728551 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 11:59:40 +08:00
zhangyc
5c4a51b0f7 审核意见 2022-12-14 11:59:31 +08:00
lixg
ea3315ac32 fix:修改创建评估及编辑评估回显 2022-12-14 11:55:48 +08:00
lixg
a70b55906f feat:合并 2022-12-14 09:04:17 +08:00
lixg
0382f7ae12 feat:修改版本号 2022-12-14 09:03:23 +08:00
zhangyc
428a968f12 404 2022-12-14 08:47:37 +08:00
zhangyc
aef73624d6 面授课分类 2022-12-14 08:39:46 +08:00
zhangyc
03d9cce131 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-14 07:27:17 +08:00
zhangyc
7c8ae62f70 bug 2022-12-14 07:27:04 +08:00
lixg
a093dd629e feat:合并 2022-12-13 22:01:08 +08:00
lixg
68f5a4957e feat:合并 2022-12-13 21:49:54 +08:00
zhangyc
d9608d69e3 管理 2022-12-13 17:56:18 +08:00
zhangyc
171ad0af18 考试列表改为试卷列表,课程分类搜索 2022-12-13 14:14:19 +08:00
yuping
405b1b1c02 Merge remote-tracking branch 'origin/develop' into develop 2022-12-13 09:55:31 +08:00
lixg
dbc88a2568 feat:合并 2022-12-13 09:25:09 +08:00
lixg
f3f0442183 feat:修改版本号 2022-12-13 09:24:34 +08:00
zhangyc
a8c7308cc2 审核日志只有一条 2022-12-13 09:11:52 +08:00
zhangyc
89e889506b 课程库bug 2022-12-13 00:41:11 +08:00
yuping
98b2d367de -- 模板库修改 2022-12-13 00:28:01 +08:00
yuping
8b40d46bb1 -- 项目复制 2022-12-13 00:23:17 +08:00
yuping
240ac64d38 -- bug 2022-12-12 23:35:35 +08:00
yuping
2f4d00baa1 -- bug 2022-12-12 23:21:18 +08:00
yuping
2e78827971 -- 组织不搜索 2022-12-12 23:17:13 +08:00
zhangyc
178b3fd212 选中关卡 2022-12-12 18:17:03 +08:00
zhangyc
adb22f6d0e 始终选中一个关卡 2022-12-12 18:16:12 +08:00
lixg
8b14710d9d feat:增加token失效退出登录 2022-12-12 09:00:55 +08:00