Commit Graph

4011 Commits

Author SHA1 Message Date
yuping
daa48a3bb1 Merge remote-tracking branch 'origin/develop' into develop 2022-12-26 19:16:05 +08:00
yuping
8b7c4aabaf -- 组织添加路径 2022-12-26 19:15:57 +08:00
wuyx
f3ecc9043d fix:增加面授课新建及预览场景字段添加和展示 2022-12-26 17:52:35 +08:00
yuping
d674c660e8 -- 查看 优秀学员 2022-12-26 17:43:41 +08:00
yuping
39687730cb -- 查看 优秀学员 2022-12-26 17:30:22 +08:00
yuping
876d1b715a Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/student/TableStudent.vue
2022-12-26 17:29:49 +08:00
yuping
5e4e6f16b7 -- 查看 2022-12-26 17:19:21 +08:00
zhangyc
4698f25a22 加关卡id 2022-12-26 17:15:03 +08:00
huangshengfa
430a50b0fe Merge branch 'pre-dev' into 'develop'
fix:样式修改

See merge request !32
2022-12-26 16:57:39 +08:00
huangshengfa
285557fa67 Merge branch 'pre-release' into 'release'
fix:样式修改

See merge request !31
2022-12-26 16:57:05 +08:00
wuyx
ea67d8530b fix:样式修改 2022-12-26 16:40:12 +08:00
huangshengfa
c5d815bf42 Merge branch 'pre-release' into 'release'
Pre release

See merge request !30
2022-12-26 16:37:32 +08:00
huangshengfa
e089fcf93e Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !29
2022-12-26 16:33:09 +08:00
wuyx
fdfe422baf fix:属性重复问题 2022-12-26 16:31:46 +08:00
yuping
0f3df97c1e Merge remote-tracking branch 'origin/develop' into develop 2022-12-26 16:28:48 +08:00
yuping
31fb69331f -- bug 2022-12-26 16:28:33 +08:00
huangshengfa
f9fa4bc623 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !28
2022-12-26 16:19:11 +08:00
wuyx
337b63bfb4 fix:修改版本号 2022-12-26 16:17:01 +08:00
wuyx
2087e151bb style:部分学员样式添加 2022-12-26 16:16:17 +08:00
yuping
32b8364487 -- bug 2022-12-26 15:56:09 +08:00
yuping
cfadec855b -- bug 2022-12-26 15:50:52 +08:00
yuping
316a63dd87 Merge remote-tracking branch 'origin/develop' into develop 2022-12-26 15:43:38 +08:00
yuping
fa26be2124 -- 项目时间限制 2022-12-26 15:42:36 +08:00
yuping
042ba39f6a -- 考试bug 2022-12-26 15:34:39 +08:00
yuping
4093514997 -- 考试bug 2022-12-26 15:32:56 +08:00
zhangyc
7cbb7f8db9 编辑考试 2022-12-26 15:11:06 +08:00
yuping
8a443de361 Merge remote-tracking branch 'origin/manage-release' into manage-release 2022-12-26 14:58:54 +08:00
yuping
b07b32098d -- 学员选择bug 2022-12-26 14:58:45 +08:00
dongruihua
a197cf389f Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2022-12-26 11:19:34 +08:00
zhangyc
9750a1417d 隐藏场景 2022-12-26 11:09:30 +08:00
zhangyc
baa3d3586d 隐藏场景 2022-12-26 10:58:37 +08:00
dongruihua
85ebbaa44d Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2022-12-26 09:33:21 +08:00
yuping
450ab28b65 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into manage-release 2022-12-26 09:10:33 +08:00
yuping
bec602b007 Merge remote-tracking branch 'origin/develop' into develop 2022-12-26 09:10:10 +08:00
yuping
4fb7fe59ed -- 修改版本号 2022-12-26 09:10:02 +08:00
zhangyc
44c8d7e43f 恢复重置 2022-12-26 08:54:47 +08:00
zhangyc
072a9cab52 项目搜索啊 2022-12-26 08:35:40 +08:00
dongruihua
c4e63e0bae Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-26 08:13:59 +08:00
yuping
60dc9ffcf7 -- bug 2022-12-26 01:23:01 +08:00
yuping
a03ce1727a Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into manage-release 2022-12-25 23:30:59 +08:00
yuping
5693bd9ee1 -- bug 2022-12-25 23:30:33 +08:00
yuping
4c3b3c78e7 -- bug 2022-12-25 22:41:32 +08:00
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