hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-24 18:22:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,368 Commits 79 Branches 1 Tag
133bccd0aae3f40f543de4867340b02e90d586b4
Commit Graph

523 Commits

Author SHA1 Message Date
mx00085@163.com
dd76f32361 Merge branch 'develop' of http://10.251.129.121/boeu/fe-manage into dev_m 2023-03-09 15:55:46 +08:00
mx00085@163.com
4514db4b10 fix: token设置 2023-03-09 15:50:13 +08:00
huangshengfa
fa1d2c2ad3 Merge branch 'pre-dev' into 'develop' 
Pre dev

See merge request !69
 2023-03-09 08:44:34 +08:00
lpq
55e721f602 学员添加判断 2023-03-08 23:59:42 +08:00
huangshengfa
3e3a25e2a7 Merge branch 'new-dev' into 'develop' 
New dev

See merge request !62
 2023-03-08 09:20:34 +08:00
yuping
49dc8a552e -- fix 权限管理 2023-03-08 02:13:39 +08:00
huangshengfa
683f74a7a0 Merge branch 'develop' into 'pre-dev' 
# Conflicts:
#   src/components/NavLeft.vue
 2023-03-07 18:10:11 +08:00
wyx
63eafe934b feat:增加教师入口跳转链接 2023-03-07 16:07:10 +08:00
dongruihua
53d948f076 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-04 09:28:54 +08:00
yuping
77aac9cdcf -- fix bug 2023-03-04 02:53:02 +08:00
yuping
8b6e5201ce -- fix bug 2023-03-03 19:23:23 +08:00
huangshengfa
d184fa0e3d Merge branch 'dev_m' into 'develop' 
feat: 课程新增类型选项

See merge request !50
 2023-03-03 09:13:16 +08:00
mx00085@163.com
f8ea57c62a feat: 课程新增类型选项 2023-03-03 09:05:59 +08:00
huangshengfa
333fe06024 Merge branch 'dev_m' into 'develop' 
fix: 概览页面状态更改

See merge request !48
 2023-03-01 10:59:58 +08:00
mx00085@163.com
44028277d4 fix: 概览页面状态更改 2023-03-01 10:36:27 +08:00
dongruihua
931bd12bbc Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-01 09:17:39 +08:00
yuping
2ac835e4f9 -- fix bug 2023-02-28 16:51:19 +08:00
huangshengfa
5ac2e40633 Merge branch 'pre-dev' into 'develop' 
Pre dev

See merge request !44
 2023-02-28 09:02:53 +08:00
yuping
f430d8bdf6 -- fix bug 2023-02-27 19:07:46 +08:00
dongruihua
48713a1abb Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-02-26 18:45:02 +08:00
wyx
755354e7db fix:学习路径图添加项目任务获取项目列表接口更新 2023-02-26 12:40:01 +08:00
dongruihua
ce9dab06fb Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 
# Conflicts:
#	vue.config.js
 2023-02-26 09:41:33 +08:00
caozc
85713a9c04 增加催促考试 2023-02-25 17:06:54 +08:00
dongruihua
10c9ad20c9 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 
# Conflicts:
#	vue.config.js
 2023-02-25 09:26:29 +08:00
yuping
3c6ec2b9e9 -- fix bug 2023-02-24 20:44:09 +08:00
dongruihua
6fac22c9d5 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 
# Conflicts:
#	vue.config.js
 2023-02-24 09:04:29 +08:00
yuping
c41c8c74a4 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/components/drawers/CheckStu.vue
 2023-02-24 04:36:07 +08:00
yuping
9e4ce50e77 -- fix bug 2023-02-24 04:35:19 +08:00
caozc
c7af808ac0 【2.23第一轮测试-面授管理-开课】创建开课点击保存 一直转圈，无法创建成功 
【生产环境-课程库-面授管理】点击“查看”预览，点击预览中的"下载"会从当前窗口打开，打开后没有返回按钮，无法返回上一级，操作不方便，优化一下
【2.23第一轮测试-学习路径图-任务】创建外部考试，显示保存成功，但是到任务列表中看不到此任务
 2023-02-24 00:35:13 +08:00
huangshengfa
20a347e91b Merge branch 'dev_m' into 'develop' 
fix: 左侧导航更改，概览页面tab总数更改

See merge request !42
 2023-02-21 17:07:02 +08:00
mx00085@163.com
87094d3f77 fix: 左侧导航更改，概览页面tab总数更改 2023-02-21 17:05:50 +08:00
dongruihua
ae4b4cb3d0 Merge branch 'develop' of http://10.251.129.121/boeu/fe-manage into develop 2023-02-21 09:20:35 +08:00
李东进1
80d520bfd0 bug修复 2023-02-21 07:50:14 +08:00
李东进1
7e6c6a95dc bug修复 2023-02-20 22:44:00 +08:00
mx00085@163.com
6af842daaa fix: 冲突解决 2023-02-20 16:59:37 +08:00
yuping
540fad699a fix --模板 2023-02-20 16:23:44 +08:00
mx00085@163.com
d19aba8623 feat: 概览，学习组织数据接口联调 2023-02-20 14:33:36 +08:00
wyx
e33a71a027 feat:面授课修改记录增加 2023-02-20 12:22:07 +08:00
yuping
75fa07aa98 fix bug 2023-02-19 01:19:16 +08:00
yuping
2d3a95f1bd --fix 复制 2023-02-17 21:18:09 +08:00
yuping
33429c046c --fix bug 2023-02-17 17:59:25 +08:00
wyx
a7d30f3f8b fix:任务管理学员显示问题修改 2023-02-17 11:37:16 +08:00
yuping
fcf09a9b3d --fix bug 2023-02-17 01:29:19 +08:00
yuping
acabc1556c --fix bug 2023-02-16 22:03:45 +08:00
yuping
fffea9689d Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/components/drawers/UnlockMode.vue
#	src/views/learningpath/LevelAddDetail.vue
 2023-02-16 18:32:49 +08:00
wyx
36f763559b feat:增加学习路径图学习模式切换 2023-02-16 18:24:37 +08:00
yuping
6f3ac7b810 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	src/api/indexLearningPath.js
 2023-02-16 17:21:18 +08:00
yuping
f2fd47a078 --fix 路径图整体修改 2023-02-16 17:19:14 +08:00
wyx
5591a98e33 fix:更新调试项目、学习路径图共享文档编辑 2023-02-16 16:55:55 +08:00
yuping
00c50a9e3c --fix 路径图整体修改 2023-02-16 13:08:35 +08:00