hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 19:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,732 Commits 68 Branches 1 Tag
0e8341f980bb17fffadcc993d25e5d4cb1f3bde8
Commit Graph

3732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wyx
4149a6a56f fix:修改版本号 2023-03-20 08:48:20 +08:00
yuping
a4e6e03791 --fix bug 2023-03-18 15:30:30 +08:00
yuping
58758da4e9 --fix bug 2023-03-18 13:57:02 +08:00
yuping
63ea5b3862 --fix bug 重复数据 2023-03-18 13:30:50 +08:00
yuping
7e391e6145 --fix bug 重复数据 2023-03-18 13:15:58 +08:00
yuping
38efcd780c --demand 面授课 2023-03-18 00:54:02 +08:00
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
BOE\10867418
06801be579 Merge branch 'dongwu_develop' into boe_develop 2023-03-17 16:49:18 +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
dongruihua
ac618dd084 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 
# Conflicts:
#	src/App.vue
 2023-03-17 10:54:49 +08:00
wyx
92e10e91ac fix:修改版本号 2023-03-17 09:08:40 +08:00
wyx
c14660d79f fix:修改版本号 2023-03-17 09:07:14 +08:00
wyx
366aa31090 Merge branch 'develop' into manage-release 2023-03-17 09:05:21 +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
huangshengfa
e59c4ad5f5 Merge branch 'dev_Ma_pre' into 'develop' 
屏蔽草稿

See merge request !90
 2023-03-16 10:51:46 +08:00
BOE\10867418
b8d3ed1cdc 屏蔽草稿 2023-03-16 10:51:00 +08:00
huangshengfa
5088ac6a75 Merge branch 'dev_Ma_pre' into 'develop' 
修改父级状态

See merge request !89
 2023-03-16 09:52:26 +08:00
BOE\10867418
ac9447c7e3 父级状态 2023-03-16 09:51:36 +08:00
BOE\10867418
0d284d01cd 状态 2023-03-15 19:31:40 +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
huangshengfa
14a0ec5294 Merge branch 'dev_Ma_pre' into 'develop' 
提交

See merge request !87
 2023-03-15 16:38:36 +08:00
BOE\10867418
3f3438db7b 提交 2023-03-15 16:37:51 +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
huangshengfa
8c18ebebff Merge branch 'dev_Ma_pre' into 'develop' 
Dev ma pre

See merge request !86
 2023-03-14 15:59:14 +08:00
BOE\10867418
81b40b9ae9 去除中间域名 2023-03-14 15:56:01 +08:00
BOE\10867418
850115a223 fixed 2023-03-14 13:18:45 +08:00