Commit Graph

1932 Commits

Author SHA1 Message Date
zhangyc
cc588d3e95 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-23 20:01:56 +08:00
zhangyc
22b6f33d06 版本号 2022-12-23 20:01:51 +08:00
yuping
4b5ff20e9f Merge remote-tracking branch 'origin/develop' into develop 2022-12-23 19:12:42 +08:00
yuping
ddba94836b -- bug 2022-12-23 19:12:26 +08:00
zhangyc
f7736a7219 面授课考试推送 2022-12-23 16:48:50 +08:00
zhangyc
1924c6d168 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-23 16:24:26 +08:00
zhangyc
81c3b9ac2b 考试增加target字段 2022-12-23 16:21:42 +08:00
yuping
9baf321254 -- 授课教师 2022-12-23 15:07:10 +08:00
wuyx
da534ae876 修改api转发 2022-12-23 11:05:08 +08:00
zhangyc
be9f5d9d91 作业改为任务 2022-12-23 09:24:45 +08:00
wuyx
d924e0b768 合并 2022-12-23 09:14:25 +08:00
wuyx
f2e093fb84 fix 2022-12-23 09:10:49 +08:00
quhongwei
afa3123f17 修改版本号 2022-12-23 09:09:18 +08:00
quhongwei
f3f39ba34f Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-23 09:05:16 +08:00
yuping
da9a7c86c1 Merge remote-tracking branch 'origin/develop' into develop 2022-12-23 01:40:08 +08:00
yuping
25f8dbd6b4 -- 开课添加学员 2022-12-23 01:39:49 +08:00
zhangyc
2a6678fb23 样式bug修改 2022-12-23 01:38:22 +08:00
zhangyc
3b89818115 评估删除选项改为删除题目 2022-12-23 00:39:44 +08:00
yuping
94f83e5360 -- 项目搜索 2022-12-22 23:20:31 +08:00
yuping
6fa476aa1c -- 附件上传url 2022-12-22 22:30:37 +08:00
yuping
0cbf744561 -- 附件上传url 2022-12-22 20:40:09 +08:00
yuping
b44e070069 -- 合并冲突 2022-12-22 19:18:49 +08:00
yuping
7668dc6616 Merge remote-tracking branch 'origin/manage-release' into manage-release
# Conflicts:
#	src/components/student/ChangeLevelModal.vue
#	src/components/student/TableStudent.vue
2022-12-22 19:08:42 +08:00
yuping
7dfaf3a3b0 Merge branch 'develop' into manage-release
# Conflicts:
#	src/App.vue
#	src/components/drawers/AddHomework.vue
#	src/components/drawers/AddTest.vue
#	src/components/student/ChangeLevelModal.vue
#	src/components/student/TableStudent.vue
#	src/views/examine/ProjectReviewed.vue
2022-12-22 19:05:26 +08:00
wyx
d1dcb4ecab fix:合并冲突 2022-12-22 19:01:28 +08:00
quhongwei
adcad35c59 增加过滤文件 2022-12-22 18:46:23 +08:00
wyx
0572e832c8 Merge branch 'develop' into 'master'
Develop

See merge request !1
2022-12-22 10:45:36 +00:00
yuping
52bf37a00d -- 上传路径不对 2022-12-22 18:20:16 +08:00
yuping
f33f2cd99a -- 批量跳转关卡 2022-12-22 18:16:36 +08:00
yuping
13e27ae3ca -- 学员数量 2022-12-22 17:31:27 +08:00
zhangyc
52db18777d 1.01版本 2022-12-22 15:50:20 +08:00
zhangyc
6220685ca8 选用模板编辑下项目保存时间bug 2022-12-22 15:48:49 +08:00
yuping
e1e4a005ce -- 组织书 2022-12-22 14:22:33 +08:00
zhangyc
d740f6be8e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-22 13:01:53 +08:00
zhangyc
9f4b9a3e29 已审核已发布项目不可编辑 2022-12-22 13:01:46 +08:00
wuyx
702e6e344b fix:禁用作业过去时间选择 2022-12-22 12:36:16 +08:00
yuping
80c7496901 -- 文件上唇路径不对 2022-12-22 12:13:09 +08:00
lixg
13f9161781 feat:合并 2022-12-22 11:19:36 +08:00
lixg
859126dc06 feat:增加调整关卡弹窗 2022-12-22 11:18:45 +08:00
wuyx
a236a9ccb8 fix:项目显示问题 2022-12-22 09:48:46 +08:00
zhangyc
b0d57bf577 时间搜索 2022-12-22 09:32:17 +08:00
zhangyc
2978e0d724 列表搜索后仍然选中第二个 2022-12-22 07:57:22 +08:00
yuping
05492770a4 -- 时间选择到分 2022-12-21 17:24:41 +08:00
yuping
03e9e50061 -- 项目搜索状态 2022-12-21 17:16:13 +08:00
zhangyc
cb1a7dbc9a Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-21 16:55:37 +08:00
zhangyc
cb0ffbf363 学员管理搜索 2022-12-21 16:55:27 +08:00
lixg
841d16f33e feat:合并 2022-12-21 16:32:50 +08:00
lixg
76160bfd30 fix:隐藏面授课新建的在线按钮 2022-12-21 16:31:28 +08:00
wyx
a068f4d530 fix:修改项目阶段删除/增加排序/初始化选择 2022-12-21 15:38:00 +08:00
wyx
6854b6a0d0 fix:修改项目阶段删除/增加排序/初始化选择 2022-12-21 15:36:55 +08:00