Commit Graph

4369 Commits

Author SHA1 Message Date
kclf
27641c0502 Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage 2022-11-25 20:48:21 +08:00
kclf
7a6f118bac 合并课程 2022-11-25 20:25:27 +08:00
宋文超
8bacca94a8 合并 2022-11-25 18:29:19 +08:00
宋文超
2517b9f6e9 合并 2022-11-25 18:27:29 +08:00
王熙东
3184508078 feat:直播和面授添加教师的下拉列表,修改模板id,修改发布公告 2022-11-25 18:27:08 +08:00
宋文超
36da16fc0d 模板库添加各任务 待审核课程数据及各样式 面授课修改输入 2022-11-25 18:21:40 +08:00
dongruihua
16c230b7d4 Merge branch 'develop' of http://10.251.129.121/boeu/fe-manage into develop
# Conflicts:
#	vue.config.js
2022-11-25 18:05:11 +08:00
dongruihua
d4f03852b5 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
#	package-lock.json
2022-11-25 17:56:47 +08:00
lixg
7fa58e7869 feat:注销iframe嵌套限制 2022-11-25 17:36:18 +08:00
lixg
35ba74c3f7 feat:注释自动跳转 2022-11-25 17:34:41 +08:00
huangshengfa
8272fb7413 Update vue.config.js 2022-11-25 16:50:29 +08:00
lixg
a9b85f3802 feat:打开获取cookie 2022-11-25 15:53:47 +08:00
lixg
64ff3b82f2 feat:合并 2022-11-25 15:14:25 +08:00
lixg
762dbf90a7 feat:增加获取用户信息以及token失效跳到登录页 2022-11-25 15:13:20 +08:00
王熙东
8bee115446 fix: 公告style修改,去除编辑规则 2022-11-25 09:34:53 +08:00
Ggysh-7
586d06148f 合并 2022-11-25 07:23:53 +08:00
Ggysh-7
dd67df4f0b fix:清除案例和测评的测试无用数据和多余consolelog 2022-11-25 07:21:58 +08:00
zhangyc
538fc5b189 Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage 2022-11-25 07:07:47 +08:00
zhangyc
e9e947b954 模板库添加任务 2022-11-25 07:07:41 +08:00
Ggysh-7
18904331a2 合并 2022-11-24 19:42:36 +08:00
Ggysh-7
00c0b1f261 合并 2022-11-24 19:42:25 +08:00
Ggysh-7
103604c653 fix:项目抽屉添加多条情况已测试成功,项目任务大纲获取列表参数修改 请求成功但无数据 2022-11-24 19:32:18 +08:00
宋文超
c1f4c833cb Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage 2022-11-24 18:15:39 +08:00
宋文超
62c3b2dfa3 添加项目 路径图上传样式 2022-11-24 18:15:35 +08:00
王熙东
9df0de97b1 feat: 发布公告,积分获取和修改 2022-11-24 17:31:00 +08:00
lixg
1dd90d9b1e feat:增加嵌套页面 2022-11-24 17:17:24 +08:00
lixg
753d0a8623 feat:合并 2022-11-24 15:11:53 +08:00
lixg
affd52588a feat:增加组织树及项目归属权获取数据 2022-11-24 15:10:01 +08:00
宋文超
df731a58f0 Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage 2022-11-24 14:29:54 +08:00
宋文超
379c6d2ae3 审核 2022-11-24 14:29:47 +08:00
zhangyc
07280d5643 Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage 2022-11-24 14:27:37 +08:00
zhangyc
646df5f2b5 学习路径添加项目 2022-11-24 14:27:29 +08:00
王熙东
08a77174d9 feat: 模板编辑回传,阶段添加刷新,阶段默认选中 2022-11-24 14:15:40 +08:00
zhangyc
a1cc502454 模板库列表 2022-11-24 09:58:36 +08:00
zhangyc
64cac787d4 Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage 2022-11-24 04:08:59 +08:00
zhangyc
06f5c6c743 模板库添加任务评估 2022-11-24 04:08:51 +08:00
Ggysh-7
c2e43611c8 feat:合并 2022-11-23 23:11:28 +08:00
Ggysh-7
c269df0c1a 合并 2022-11-23 23:10:59 +08:00
Ggysh-7
cff9a26071 fix:关卡和阶段添加测评完善需要有效token,关卡添加关联项目完善,修改遍历方法 2022-11-23 23:07:03 +08:00
kclf
7b0930cc6d Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage 2022-11-23 22:52:59 +08:00
kclf
b8c1e2f0ff t 2022-11-23 22:52:56 +08:00
宋文超
00fbe3a3fa Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage 2022-11-23 18:25:55 +08:00
宋文超
7b8eb9327f feat:审核项目 项目审核日志 面授 上传 2022-11-23 18:25:51 +08:00
kclf
1f870a2790 t 2022-11-23 15:48:13 +08:00
kclf
da2e393f58 Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage 2022-11-23 15:47:12 +08:00
kclf
dd2d689223 t 2022-11-23 15:47:09 +08:00
kclf
b27ceca554 Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage 2022-11-23 15:46:12 +08:00
lixg
57b9ba8263 feat:合并 2022-11-23 15:42:17 +08:00
lixg
059f1b3a54 feat:增加项目审核及撤回审核弹窗 2022-11-23 15:41:55 +08:00
kclf
ff8213ccbf 提交部分 2022-11-23 15:39:22 +08:00