Commit Graph

244 Commits

Author SHA1 Message Date
zhangyc
2a6678fb23 样式bug修改 2022-12-23 01:38:22 +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
yuping
f33f2cd99a -- 批量跳转关卡 2022-12-22 18:16:36 +08:00
zhangyc
6220685ca8 选用模板编辑下项目保存时间bug 2022-12-22 15:48:49 +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
lixg
13f9161781 feat:合并 2022-12-22 11:19:36 +08:00
lixg
859126dc06 feat:增加调整关卡弹窗 2022-12-22 11:18:45 +08:00
zhangyc
2978e0d724 列表搜索后仍然选中第二个 2022-12-22 07:57:22 +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
a862d18f18 style:修改添加学员滚动条 2022-12-21 09:54:44 +08:00
lixg
79249cb21f feat:修改版本号 2022-12-21 08:55:19 +08:00
lixg
22663e7e13 feat:合并 2022-12-21 08:47:55 +08:00
yuping
b6cc723c25 -- 受众查询 2022-12-20 19:11:58 +08:00
yuping
389d0ac4a5 -- 受众查询 2022-12-20 18:56:33 +08:00
yuping
127039cc61 -- 受众查询 2022-12-20 18:48:10 +08:00
lixg
4cacbfecfa feat:合并 2022-12-20 18:37:17 +08:00
lixg
48af0a81be feat:修改版本 2022-12-20 18:36:55 +08:00
yuping
6cd7eb3bdc -- 屏蔽组织选择 2022-12-20 18:24:42 +08:00
lixg
f73a467ab8 feat:合并 2022-12-20 17:30:06 +08:00
lixg
ed22b3f985 feat:合并 2022-12-20 15:59:59 +08:00
lixg
22356826b8 fix:修改添加作业接口判断 2022-12-20 15:59:23 +08:00
yuping
b971e9eca8 -- bug 2022-12-20 13:55:01 +08:00
yuping
c89473b54a Merge remote-tracking branch 'origin/develop' into develop 2022-12-20 13:28:55 +08:00
yuping
12a5829d30 -- bug 2022-12-20 13:28:45 +08:00
zhangyc
a98af9134e 添加学员样式 2022-12-20 08:36:07 +08:00
lixg
1d968037ae feat:合并 2022-12-19 21:44:44 +08:00
lixg
360b068a1b fix:修改公告内容 2022-12-19 21:44:20 +08:00
yuping
83a0ae8e18 -- 开课学员bug 2022-12-19 21:37:23 +08:00
yuping
78ecfd3d6a -- 学员泪飙默认不展示 2022-12-19 19:41:08 +08:00
yuping
790030d8d1 -- 项目不需要选择阶段 2022-12-19 19:35:54 +08:00
lixg
35f561c411 feat:合并 2022-12-19 17:34:00 +08:00
lixg
ff2a15ae1f fix:修改学员操作样式 2022-12-19 17:33:25 +08:00
yuping
045efac89e -- bug 2022-12-19 17:24:12 +08:00
lixg
777b257b1b feat:合并 2022-12-18 21:16:14 +08:00
yuping
034a75424a -- 添加学员 2022-12-18 13:49:23 +08:00
yuping
c1983082a5 -- 添加学员 2022-12-17 17:40:47 +08:00
zhangyc
b744d6ae74 修改button 操作按钮样式 2022-12-12 02:10:09 +08:00
yuping
7864c1ec0f -- 样式修改 2022-12-10 16:41:08 +08:00
yuping
39f8bd9830 -- 新建学员管理 2022-12-10 14:49:53 +08:00