Commit Graph

4369 Commits

Author SHA1 Message Date
zhangyc
3003d69468 去掉页面tab缓存记录 2022-12-25 22:17:24 +08:00
zhangyc
eb47cfef65 配置考试 2022-12-25 21:18:46 +08:00
dongruihua
59986e257a Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2022-12-25 19:47:35 +08:00
dongruihua
ce87101412 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-25 19:38:44 +08:00
yuping
d34c65408b Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into manage-release 2022-12-25 19:26:43 +08:00
yuping
13a0a6469c Merge remote-tracking branch 'origin/manage-release' into manage-release
# Conflicts:
#	src/components/drawers/AddHomework.vue
2022-12-25 19:24:49 +08:00
zhangyc
3522dd89e2 版本号 2022-12-25 19:23:15 +08:00
yuping
a47aa4c6f3 Merge remote-tracking branch 'origin/develop' into manage-release
# Conflicts:
#	src/components/drawers/AddHomework.vue
2022-12-25 19:21:54 +08:00
zhangyc
285494d592 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-25 16:36:10 +08:00
zhangyc
2a0e6c5870 创建路径名字重复校验 2022-12-25 16:29:14 +08:00
wuyx
5870944160 fix:修改三级分类名称 2022-12-25 14:50:10 +08:00
wuyx
0761125c69 fix:面授课预览三级分类显示 2022-12-25 12:31:15 +08:00
zhangyc
a44efa9931 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-25 12:23:26 +08:00
wuyx
b20b2dbd04 fix:面授课三级分类添加 2022-12-25 12:22:51 +08:00
zhangyc
10bffd37ef 考试推送type 2022-12-25 12:05:23 +08:00
dongruihua
625120fd0d Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-25 10:05:51 +08:00
zhangyc
373786ab8a 版本号 2022-12-24 19:50:04 +08:00
zhangyc
1a64fc520d 上传附件统一样式 2022-12-24 19:48:21 +08:00
zhangyc
48206694f3 附件样式 2022-12-24 10:10:47 +08:00
zhangyc
c3fc222913 撤回发布的 、已审核的可以修改 2022-12-24 00:17:13 +08:00
zhangyc
c730b97898 上传附件 2022-12-24 00:10:55 +08:00
zhangyc
ea31837912 上传样式跑偏 2022-12-23 22:59:24 +08:00
huangshengfa
bcaf79b191 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !27
2022-12-23 20:11:51 +08:00
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
huangshengfa
dff49770b5 Merge branch 'pre-dev' into 'develop'
修改api转发

See merge request !26
2022-12-23 11:07:27 +08:00
wuyx
da534ae876 修改api转发 2022-12-23 11:05:08 +08:00
yujicun
e665e22f73 Merge remote-tracking branch 'origin/develop' into develop 2022-12-23 09:48:40 +08:00
yujicun
5acdf3c9aa Merge remote-tracking branch 'origin/manage-release' into release 2022-12-23 09:47:39 +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
huangshengfa
eb47922763 Merge branch 'pre-release' into 'release'
Pre release

See merge request !25
2022-12-22 19:28:23 +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