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,094 Commits 79 Branches 1 Tag
8ca301256d4236d500b70cd774bcce8dfc57bd23
Commit Graph

493 Commits

Author SHA1 Message Date
yuping
6337b811cd --fix bug 系统报错提示 2023-03-24 03:50:10 +08:00
BOE\10867418
a182e2c154 Merge branch 'dongwu_develop' into develop 2023-03-22 17:14:29 +08:00
yuping
7c1a53ca71 --fix bug 2023-03-22 13:02:40 +08:00
BOE\10867418
0f16b94b7a Merge branch 'dongwu_develop' into develop 2023-03-22 09:46:20 +08:00
yuping
8c505ef996 --fix bug 2023-03-22 01:58:51 +08:00
yujicun
bd3b9ec181 Merge remote-tracking branch 'origin/develop' into develop 2023-03-21 15:37:28 +08:00
yuping
91834a027c --fix bug 2023-03-21 15:34:56 +08:00
BOE\10867418
94b570de4a Merge branch 'dongwu_develop' into boe_develop 2023-03-20 09:47:24 +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
1184560188 fix:页面权限刷新判断显示问题修改 2023-03-17 15:25:34 +08:00
wyx
fe2a9a69bc fix:returnUrl配置问题修改 2023-03-17 12:54:32 +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
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
wyx
849256f4c6 feat:增加登录的returnUrl 2023-03-15 17:46:28 +08:00
BOE\10867418
81b40b9ae9 去除中间域名 2023-03-14 15:56:01 +08:00
BOE\10867418
d35fd52e0f 修改域名 2023-03-10 15:03:53 +08:00
mx00085@163.com
6b073227bb fix: 按钮修改 2023-03-09 16:16:27 +08:00
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