Commit Graph

3172 Commits

Author SHA1 Message Date
yuping
5522b5c2dc Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/AddOpenCourse.vue
2023-03-18 00:34:04 +08:00
yuping
8c7755c1c4 --demand 面授课 2023-03-18 00:32:32 +08:00
wyx
280fb6c279 style:修改开课样式 2023-03-17 15:58:25 +08:00
wyx
7858a8a500 style:修改开课样式 2023-03-17 15:58:00 +08:00
lixg
59eaa6a51d feat:合并 2023-03-17 15:34:15 +08:00
lixg
d95509628d feat:修改项目任务二维码传参 2023-03-17 15:33:49 +08:00
wyx
1184560188 fix:页面权限刷新判断显示问题修改 2023-03-17 15:25:34 +08:00
yuping
f349acaa75 --demand 面授课 2023-03-17 14:59:37 +08:00
yuping
7b52f2d3e6 Merge remote-tracking branch 'origin/develop' into develop 2023-03-17 14:45:33 +08:00
yuping
01ba9921cf --demand 面授课 2023-03-17 14:45:08 +08:00
wyx
b5a5a3c0a3 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-17 14:35:43 +08:00
wyx
6871702cd0 fix:路径图弹框问题 2023-03-17 14:35:38 +08:00
lixg
c0c0539e84 feat:合并 2023-03-17 14:12:52 +08:00
lixg
82ecfe44b9 feat:修改二维码传参 2023-03-17 14:00:51 +08:00
wyx
ff93d6819c fix:学习路径删除问题修改 2023-03-17 13:01:38 +08:00
wyx
fe2a9a69bc fix:returnUrl配置问题修改 2023-03-17 12:54:32 +08:00
lixg
0dcdd14298 feat:合并 2023-03-17 11:52:39 +08:00
wyx
92e10e91ac fix:修改版本号 2023-03-17 09:08:40 +08:00
yuping
43b1c9c2ce Merge remote-tracking branch 'origin/develop' into develop 2023-03-17 03:08:43 +08:00
yuping
e68aeb246b --demand 面授课 2023-03-17 03:08:28 +08:00
zhangyc
b546c86c7b 积分规则文字描述 2023-03-16 18:30:31 +08:00
wyx
cf8e0e72b7 feat:增加直播、活动考勤分页 2023-03-16 16:46:21 +08:00
wyx
48498b448f fix:面授课操作-slot的切换数据不刷新问题 2023-03-15 18:32:12 +08:00
wyx
03c8b30539 fix:编辑面授课附件上传问题 2023-03-15 18:11:59 +08:00
wyx
c6d649b0ae fix:面授课已发布隐藏删除按钮 2023-03-15 18:00:35 +08:00
wyx
849256f4c6 feat:增加登录的returnUrl 2023-03-15 17:46:28 +08:00
wyx
ecee246a5c fix:开课附件上传未保存问题修改 2023-03-15 17:30:47 +08:00
wyx
bef43237b0 feat:旧版管理员界面跳转添加 2023-03-15 15:55:10 +08:00
wyx
761b8a9f40 feat:增加根据用户权限判断当用户进入管理员端展示的界面。 2023-03-15 15:07:36 +08:00
wyx
fa431338c8 style:新版面授课界面添加 2023-03-14 18:50:18 +08:00
yuping
f8816f0df4 -- fix 评估管理查看bug 2023-03-13 21:19:21 +08:00
yuping
7ae02e9ec3 Merge remote-tracking branch 'origin/develop' into develop 2023-03-13 18:51:19 +08:00
yuping
7f36db4f4c -- fix 评估管理查看bug 2023-03-13 18:51:09 +08:00
wyx
2a745b7ae5 fix:面授课编辑后附件路径变化问题修改 2023-03-13 10:11:25 +08:00
lixg
18995ac830 feat:合并 2023-03-13 09:13:12 +08:00
lixg
d31c1f9537 feat:隐藏二维码提示 2023-03-13 09:12:46 +08:00
李东进1
e3f7b9249e +按钮 2023-03-10 21:46:58 +08:00
caozc
507f4a1e6b fix:跳转新tab页 2023-03-10 20:35:30 +08:00
wyx
f1f438b952 fix:作业无附件处理 2023-03-10 18:07:21 +08:00
yuping
c3f9bad2a7 Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 17:53:23 +08:00
yuping
434665e7e9 -- fix bug 2023-03-10 17:53:04 +08:00
lixg
942991ca3c feat:合并 2023-03-10 17:17:59 +08:00
lixg
9ee7f16f88 feat:修改评估二维码 2023-03-10 17:13:11 +08:00
caozc
a814c0d2fe update 2023-03-10 16:13:12 +08:00
yuping
ba5810826f Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 15:57:06 +08:00
yuping
fa33f4f9de -- fix 项目权限 2023-03-10 15:56:29 +08:00
caozc
37822ffd11 update: 优化影藏时长 2023-03-10 14:24:52 +08:00
wyx
0f08aa0419 fix:用户头像显示问题修复 2023-03-10 13:19:10 +08:00
peiqingliu
c9873ea3ba Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-10 13:00:40 +08:00
peiqingliu
0cad3809b4 修改 2023-03-10 13:00:24 +08:00